[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 0d853c: Fix: [ bug #1118 ] Minor prob
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 0d853c: Fix: [ bug #1118 ] Minor problem on print page lin... |
Date: |
Thu, 21 Nov 2013 09:47:22 -0800 |
Branch: refs/heads/3.5
Home: https://github.com/Dolibarr/dolibarr
Commit: 0d853cf73d83af2730c24419dfb588785acaa7fe
https://github.com/Dolibarr/dolibarr/commit/0d853cf73d83af2730c24419dfb588785acaa7fe
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix: [ bug #1118 ] Minor problem on print page link
Commit: 29e029161f77c92bb488fa00bad45004b7c2a3cb
https://github.com/Dolibarr/dolibarr/commit/29e029161f77c92bb488fa00bad45004b7c2a3cb
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/orders.lang
Log Message:
-----------
Fix: Restore translation lost because entry was not set into en_US lang.
Commit: 6f5e78d27e1259d67a319116d0401f44482796f3
https://github.com/Dolibarr/dolibarr/commit/6f5e78d27e1259d67a319116d0401f44482796f3
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/compta/facture.php
M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
M htdocs/fourn/facture/paiement.php
M htdocs/includes/odtphp/odf.php
M htdocs/main.inc.php
M htdocs/product/fiche.php
M htdocs/product/stock/fiche.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: 4a1f6713fffdc8a1c8d6f6ab7d176e63ce6226af
https://github.com/Dolibarr/dolibarr/commit/4a1f6713fffdc8a1c8d6f6ab7d176e63ce6226af
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/main.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/main.lang
Compare:
https://github.com/Dolibarr/dolibarr/compare/00b0031ddfdf...4a1f6713fffd