[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a37707: updata database for margin mo
From: |
Regis Houssin |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] a37707: updata database for margin module |
Date: |
Thu, 19 Jul 2012 10:46:27 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: a37707f96f76110ed7b8be799fe0c62dc69a4f4d
https://github.com/Dolibarr/dolibarr/commit/a37707f96f76110ed7b8be799fe0c62dc69a4f4d
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/install/mysql/tables/llx_commandedet.sql
M htdocs/install/mysql/tables/llx_facturedet.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
M htdocs/install/mysql/tables/llx_propaldet.sql
Log Message:
-----------
updata database for margin module
Commit: 122fc5eaa7865455a3c5ee456766540eb1fe71ed
https://github.com/Dolibarr/dolibarr/commit/122fc5eaa7865455a3c5ee456766540eb1fe71ed
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
update propales for margins
Commit: 0cdf208f3d20584aab1a7ca1cecbc2cf5badaa5a
https://github.com/Dolibarr/dolibarr/commit/0cdf208f3d20584aab1a7ca1cecbc2cf5badaa5a
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/core/lib/ajax.lib.php
Log Message:
-----------
trigger change event when updating item value
Commit: 58262034cfdf730dbf2209c678ffe2e1b30d23f4
https://github.com/Dolibarr/dolibarr/commit/58262034cfdf730dbf2209c678ffe2e1b30d23f4
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
add extra parameters to control combo in form_thirdparty like in
select_company
Commit: 316f6ce09cc554a31db6e406c465a4d76230071a
https://github.com/Dolibarr/dolibarr/commit/316f6ce09cc554a31db6e406c465a4d76230071a
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
add margin infos to commonobject.class.php
Commit: c0ac8c9ae195c835e7e824f02d29c096de5a91ce
https://github.com/Dolibarr/dolibarr/commit/c0ac8c9ae195c835e7e824f02d29c096de5a91ce
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
fetch margin infos on line object
Commit: 1de9dc15bfc672c2e24f42697cefb0a7f58e3527
https://github.com/Dolibarr/dolibarr/commit/1de9dc15bfc672c2e24f42697cefb0a7f58e3527
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/core/tpl/freeproductline_create.tpl.php
M htdocs/core/tpl/freeproductline_edit.tpl.php
M htdocs/core/tpl/freeproductline_view.tpl.php
A htdocs/marges/admin/marges.php
A htdocs/marges/agentMargins.php
A htdocs/marges/css/marges.css
A htdocs/marges/customerMargins.php
A htdocs/marges/img/marges.png
A htdocs/marges/img/object_marges.png
A htdocs/marges/includes/modules/modMarges.class.php
A htdocs/marges/index.php
A htdocs/marges/langs/fr_FR/marges.lang
A htdocs/marges/lib/marges.lib.php
A htdocs/marges/productMargins.php
A htdocs/marges/tabs/productMargins.php
A htdocs/marges/tabs/thirdpartyMargins.php
Log Message:
-----------
add margin module
Commit: 50c2a65b6a94265e90a9f0ae67166fb7f428e1fa
https://github.com/Dolibarr/dolibarr/commit/50c2a65b6a94265e90a9f0ae67166fb7f428e1fa
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/core/tpl/predefinedproductline_create.tpl.php
M htdocs/core/tpl/predefinedproductline_edit.tpl.php
M htdocs/core/tpl/predefinedproductline_view.tpl.php
Log Message:
-----------
add margin infos to templates
Commit: 3844a77395ecd91982918e8d86aa92f8b68c8762
https://github.com/Dolibarr/dolibarr/commit/3844a77395ecd91982918e8d86aa92f8b68c8762
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
Log Message:
-----------
correct typing bugs
Commit: c12c8bd0bb3903ddb47867a133d4893732b6e6a7
https://github.com/Dolibarr/dolibarr/commit/c12c8bd0bb3903ddb47867a133d4893732b6e6a7
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
A htdocs/admin/marges.php
A htdocs/core/modules/modMarges.class.php
A htdocs/langs/fr_FR/marges.lang
R htdocs/marges/admin/marges.php
R htdocs/marges/includes/modules/modMarges.class.php
R htdocs/marges/langs/fr_FR/marges.lang
Log Message:
-----------
update margin modules to core module
Commit: c5fe895dce91a59ced4a0fa9cc42891c93633e68
https://github.com/Dolibarr/dolibarr/commit/c5fe895dce91a59ced4a0fa9cc42891c93633e68
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/admin/marges.php
Log Message:
-----------
adaptation to new module structure
Commit: 34022de1de6985dbe9041eb6a2a1c58ab5d296f1
https://github.com/Dolibarr/dolibarr/commit/34022de1de6985dbe9041eb6a2a1c58ab5d296f1
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/core/tpl/freeproductline_create.tpl.php
M htdocs/core/tpl/predefinedproductline_create.tpl.php
Log Message:
-----------
correction of syntax error in tpl
Commit: bd05495375dd213be57b7958d2dae34730c0559a
https://github.com/Dolibarr/dolibarr/commit/bd05495375dd213be57b7958d2dae34730c0559a
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
correct syntax error
Commit: 411bb993b5774bdbdd27c87aee62d088336770a2
https://github.com/Dolibarr/dolibarr/commit/411bb993b5774bdbdd27c87aee62d088336770a2
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/marges/lib/marges.lib.php
Log Message:
-----------
correct path to price.lib.php
Commit: efba33eb13583d4a6185ebdc8aad38ae5bd12e12
https://github.com/Dolibarr/dolibarr/commit/efba33eb13583d4a6185ebdc8aad38ae5bd12e12
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/marges/agentMargins.php
M htdocs/marges/customerMargins.php
M htdocs/marges/lib/marges.lib.php
M htdocs/marges/productMargins.php
Log Message:
-----------
adapt to new module structure
Commit: f0f52270a549be9757f4860333898745112d65cf
https://github.com/Dolibarr/dolibarr/commit/f0f52270a549be9757f4860333898745112d65cf
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/marges/tabs/productMargins.php
M htdocs/marges/tabs/thirdpartyMargins.php
Log Message:
-----------
adapt to new structure
Commit: 8e2fee02df303d4cce171b2e305330039989e854
https://github.com/Dolibarr/dolibarr/commit/8e2fee02df303d4cce171b2e305330039989e854
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
Log Message:
-----------
correct default definition for buy_price_ht in migration script
Commit: 9a7935075cad171dfbacc90f21eb1215b9a30f88
https://github.com/Dolibarr/dolibarr/commit/9a7935075cad171dfbacc90f21eb1215b9a30f88
Author: Christophe Battarel <address@hidden>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M htdocs/marges/agentMargins.php
M htdocs/marges/customerMargins.php
M htdocs/marges/productMargins.php
M htdocs/marges/tabs/productMargins.php
M htdocs/marges/tabs/thirdpartyMargins.php
Log Message:
-----------
correct margin informations when buy_price at zero
Commit: 019b857784d66733606da725d268ddf215644773
https://github.com/Dolibarr/dolibarr/commit/019b857784d66733606da725d268ddf215644773
Author: Christophe Battarel <address@hidden>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
correct display of margin resume table
Commit: b5c92c7b4695ded6390e13c2308844a5ad7c28e7
https://github.com/Dolibarr/dolibarr/commit/b5c92c7b4695ded6390e13c2308844a5ad7c28e7
Author: Christophe Battarel <address@hidden>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
correction in getlinesarray
Commit: d32091120bea03e8bb93cd5281552c2d12331455
https://github.com/Dolibarr/dolibarr/commit/d32091120bea03e8bb93cd5281552c2d12331455
Author: Christophe Battarel <address@hidden>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
Log Message:
-----------
margin management for orders
Commit: c8e211c864236085d8cfa3889c887840b6e8ae70
https://github.com/Dolibarr/dolibarr/commit/c8e211c864236085d8cfa3889c887840b6e8ae70
Author: Christophe Battarel <address@hidden>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
add missing include
Commit: 55d547348abe7cdf8b22333b6685ae2dd5917e92
https://github.com/Dolibarr/dolibarr/commit/55d547348abe7cdf8b22333b6685ae2dd5917e92
Author: Christophe Battarel <address@hidden>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
margin management for invoices
Commit: 34132de71d2cf9e921e52a73eb2f9bd97a38d34f
https://github.com/Dolibarr/dolibarr/commit/34132de71d2cf9e921e52a73eb2f9bd97a38d34f
Author: Christophe Battarel <address@hidden>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
A htdocs/fourn/product/getSupplierPrices.php
M htdocs/product/fournisseurs.php
Log Message:
-----------
add charges to supplier prices
Commit: 8e8fd724590c87dbfd75e3fe5c4fc66d0ac61fc1
https://github.com/Dolibarr/dolibarr/commit/8e8fd724590c87dbfd75e3fe5c4fc66d0ac61fc1
Author: Christophe Battarel <address@hidden>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
correct margin infos display on order
Commit: 98a2cf547e2891098d2b22e269aec7a08172decc
https://github.com/Dolibarr/dolibarr/commit/98a2cf547e2891098d2b22e269aec7a08172decc
Author: Christophe Battarel <address@hidden>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M htdocs/core/modules/modMarges.class.php
A htdocs/theme/eldy/img/menus/marges.png
Log Message:
-----------
correct module description and image
Commit: b121a01ef8de1982bd3478a17635b26b5e34a781
https://github.com/Dolibarr/dolibarr/commit/b121a01ef8de1982bd3478a17635b26b5e34a781
Author: Regis Houssin <address@hidden>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
A htdocs/admin/marges.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/ajax.lib.php
A htdocs/core/modules/modMarges.class.php
M htdocs/core/tpl/freeproductline_create.tpl.php
M htdocs/core/tpl/freeproductline_edit.tpl.php
M htdocs/core/tpl/freeproductline_view.tpl.php
M htdocs/core/tpl/predefinedproductline_create.tpl.php
M htdocs/core/tpl/predefinedproductline_edit.tpl.php
M htdocs/core/tpl/predefinedproductline_view.tpl.php
M htdocs/fourn/class/fournisseur.product.class.php
A htdocs/fourn/product/getSupplierPrices.php
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/install/mysql/tables/llx_commandedet.sql
M htdocs/install/mysql/tables/llx_facturedet.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
M htdocs/install/mysql/tables/llx_propaldet.sql
A htdocs/langs/fr_FR/marges.lang
A htdocs/marges/agentMargins.php
A htdocs/marges/css/marges.css
A htdocs/marges/customerMargins.php
A htdocs/marges/img/marges.png
A htdocs/marges/img/object_marges.png
A htdocs/marges/index.php
A htdocs/marges/lib/marges.lib.php
A htdocs/marges/productMargins.php
A htdocs/marges/tabs/productMargins.php
A htdocs/marges/tabs/thirdpartyMargins.php
M htdocs/product/fournisseurs.php
A htdocs/theme/eldy/img/menus/marges.png
Log Message:
-----------
Merge pull request #247 from cbattarel/marges
Margin module
Compare:
https://github.com/Dolibarr/dolibarr/compare/44a6236b7d86...b121a01ef8de
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] a37707: updata database for margin module,
Regis Houssin <=