[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 54f963: Trad: Fix: A better fix for s
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 54f963: Trad: Fix: A better fix for status/list of orders... |
|
Date: |
Wed, 20 Mar 2013 07:32:34 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 54f963f8ae5ca2999396421b38968f34dcd10383
https://github.com/Dolibarr/dolibarr/commit/54f963f8ae5ca2999396421b38968f34dcd10383
Author: simnandez <address@hidden>
Date: 2013-03-16 (Sat, 16 Mar 2013)
Changed paths:
M htdocs/langs/ca_ES/orders.lang
M htdocs/langs/es_ES/orders.lang
Log Message:
-----------
Trad: Fix: A better fix for status/list of orders.
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
Commit: d2d0f83fa0d87d846332482ef95428d1c8796676
https://github.com/Dolibarr/dolibarr/commit/d2d0f83fa0d87d846332482ef95428d1c8796676
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-17 (Sun, 17 Mar 2013)
Changed paths:
M htdocs/langs/ca_ES/orders.lang
M htdocs/langs/es_ES/orders.lang
Log Message:
-----------
Merge pull request #754 from simnandez/3.3
Trad: Fix: A better fix for status/list of orders.
Commit: e59084cafcb861c2aa80cd796c67f898c62f1ca6
https://github.com/Dolibarr/dolibarr/commit/e59084cafcb861c2aa80cd796c67f898c62f1ca6
Author: Christophe Battarel <address@hidden>
Date: 2013-03-18 (Mon, 18 Mar 2013)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
various fixes on margin :
- fix on sortorder
- fix for credit notes
- fix for total
Commit: f8291a9efe62388b05fd3ffa79df94a7be61a576
https://github.com/Dolibarr/dolibarr/commit/f8291a9efe62388b05fd3ffa79df94a7be61a576
Author: Christophe Battarel <address@hidden>
Date: 2013-03-18 (Mon, 18 Mar 2013)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
use ifsql function
Commit: 8a6adb8a49344502761886e07a24c9db6abc2042
https://github.com/Dolibarr/dolibarr/commit/8a6adb8a49344502761886e07a24c9db6abc2042
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-18 (Mon, 18 Mar 2013)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge pull request #756 from cbattarel/3.3
various fixes on margin :
Commit: e2f28b6c519b596ec30a5219affc2d064b821053
https://github.com/Dolibarr/dolibarr/commit/e2f28b6c519b596ec30a5219affc2d064b821053
Author: Christophe Battarel <address@hidden>
Date: 2013-03-18 (Mon, 18 Mar 2013)
Changed paths:
R htdocs/commissions/admin/commissions.php
R htdocs/commissions/index.php
R htdocs/commissions/lib/commissions.lib.php
R htdocs/core/modules/modCommissions.class.php
R htdocs/langs/ca_ES/commissions.lang
R htdocs/langs/en_US/commissions.lang
R htdocs/langs/es_ES/commissions.lang
R htdocs/langs/fr_FR/commissions.lang
R htdocs/theme/auguria/img/object_commissions.png
R htdocs/theme/bureau2crea/img/object_commissions.png
R htdocs/theme/cameleo/img/object_commissions.png
R htdocs/theme/eldy/img/object_commissions.png
Log Message:
-----------
remove experimental commissions module
Commit: f4996b4054be80f1e347d4eb189bc31fd6567106
https://github.com/Dolibarr/dolibarr/commit/f4996b4054be80f1e347d4eb189bc31fd6567106
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-19 (Tue, 19 Mar 2013)
Changed paths:
R htdocs/commissions/admin/commissions.php
R htdocs/commissions/index.php
R htdocs/commissions/lib/commissions.lib.php
R htdocs/core/modules/modCommissions.class.php
R htdocs/langs/ca_ES/commissions.lang
R htdocs/langs/en_US/commissions.lang
R htdocs/langs/es_ES/commissions.lang
R htdocs/langs/fr_FR/commissions.lang
R htdocs/theme/auguria/img/object_commissions.png
R htdocs/theme/bureau2crea/img/object_commissions.png
R htdocs/theme/cameleo/img/object_commissions.png
R htdocs/theme/eldy/img/object_commissions.png
Log Message:
-----------
Merge pull request #757 from cbattarel/3.3
remove experimental commissions module
Commit: c7666cbc3d8d9538726a8ad111ad14276bcb6653
https://github.com/Dolibarr/dolibarr/commit/c7666cbc3d8d9538726a8ad111ad14276bcb6653
Author: Christophe Battarel <address@hidden>
Date: 2013-03-20 (Wed, 20 Mar 2013)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
fix getting buying price when creating automatically an order from a proposal
(with first option activated in workflow module)
Commit: 7f4fd06f19a8f14ffc5de4848e171772e70c0630
https://github.com/Dolibarr/dolibarr/commit/7f4fd06f19a8f14ffc5de4848e171772e70c0630
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-20 (Wed, 20 Mar 2013)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #761 from cbattarel/3.3
fix getting buying price when creating automatically an order from a proposal
Commit: a3435ab8891057b1013ba188c817b61031cb6e8c
https://github.com/Dolibarr/dolibarr/commit/a3435ab8891057b1013ba188c817b61031cb6e8c
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-20 (Wed, 20 Mar 2013)
Changed paths:
M htdocs/commande/class/commande.class.php
R htdocs/commissions/admin/commissions.php
R htdocs/commissions/index.php
R htdocs/commissions/lib/commissions.lib.php
R htdocs/core/modules/modCommissions.class.php
R htdocs/langs/ca_ES/commissions.lang
M htdocs/langs/ca_ES/orders.lang
R htdocs/langs/en_US/commissions.lang
R htdocs/langs/es_ES/commissions.lang
M htdocs/langs/es_ES/orders.lang
R htdocs/langs/fr_FR/commissions.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
R htdocs/theme/auguria/img/object_commissions.png
R htdocs/theme/bureau2crea/img/object_commissions.png
R htdocs/theme/cameleo/img/object_commissions.png
R htdocs/theme/eldy/img/object_commissions.png
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/a326995c3770...a3435ab88910