[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] e7ced3: Fix Can't edit DictionaryReve
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] e7ced3: Fix Can't edit DictionaryRevenueStamp |
|
Date: |
Wed, 04 Nov 2015 16:50:39 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: e7ced322459a491da47798ff00017b56fdc487a1
https://github.com/Dolibarr/dolibarr/commit/e7ced322459a491da47798ff00017b56fdc487a1
Author: Frédéric FRANCE <address@hidden>
Date: 2015-11-02 (Mon, 02 Nov 2015)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Fix Can't edit DictionaryRevenueStamp
Commit: ea0bf44670477e2eb8ef5ee7f522837760083dca
https://github.com/Dolibarr/dolibarr/commit/ea0bf44670477e2eb8ef5ee7f522837760083dca
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-03 (Tue, 03 Nov 2015)
Changed paths:
R htdocs/install/filelist.xml
Log Message:
-----------
The ckecksum file should not be into sources. Only into packages.
Commit: 74be7bf334c5407e43d3eddccfd61581487acd65
https://github.com/Dolibarr/dolibarr/commit/74be7bf334c5407e43d3eddccfd61581487acd65
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-03 (Tue, 03 Nov 2015)
Changed paths:
M htdocs/societe/price.php
Log Message:
-----------
FIX Filter in customer price per product of a thirdparty returned error
Commit: df4f09e72f6b753321b28f4baf49cb6ad81e2526
https://github.com/Dolibarr/dolibarr/commit/df4f09e72f6b753321b28f4baf49cb6ad81e2526
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-03 (Tue, 03 Nov 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/list.php
Log Message:
-----------
FIX #3240
Commit: 826cc6db1be3ad672ff22763cc036f0e2a326f0a
https://github.com/Dolibarr/dolibarr/commit/826cc6db1be3ad672ff22763cc036f0e2a326f0a
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-04 (Wed, 04 Nov 2015)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
Log Message:
-----------
Repair old deprecated data
Commit: 0b4a1b827ae0d9cfbc4db527176acafd5d855dd0
https://github.com/Dolibarr/dolibarr/commit/0b4a1b827ae0d9cfbc4db527176acafd5d855dd0
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-04 (Wed, 04 Nov 2015)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
Log Message:
-----------
Update demo database
Commit: 497bc914934550417d50981757f486d9a4ca01b3
https://github.com/Dolibarr/dolibarr/commit/497bc914934550417d50981757f486d9a4ca01b3
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-04 (Wed, 04 Nov 2015)
Changed paths:
M htdocs/admin/dict.php
M htdocs/admin/security.php
M htdocs/comm/action/listactions.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture.php
M htdocs/contrat/card.php
M htdocs/contrat/index.php
M htdocs/contrat/services.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.formfile.class.php
A htdocs/core/js/select2_locale.js.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/mailings/modules_mailings.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
M htdocs/exports/index.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/fourn/product/list.php
R htdocs/install/filelist.xml
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/projects.lang
M htdocs/main.inc.php
M htdocs/margin/productMargins.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/class/product.class.php
M htdocs/product/composition/card.php
M htdocs/product/document.php
M htdocs/product/list.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stock/card.php
M htdocs/product/stock/mouvement.php
M htdocs/public/emailing/mailing-read.php
M htdocs/societe/consumption.php
M htdocs/societe/price.php
Log Message:
-----------
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
Commit: 09f3cd6f1d736edf090b7738f9b9e24d61b0f9ca
https://github.com/Dolibarr/dolibarr/commit/09f3cd6f1d736edf090b7738f9b9e24d61b0f9ca
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-04 (Wed, 04 Nov 2015)
Changed paths:
M htdocs/core/lib/admin.lib.php
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
Fix class cant be abstract
Commit: 77371af35a7293f1f1a14a88ea4a29f271d82c55
https://github.com/Dolibarr/dolibarr/commit/77371af35a7293f1f1a14a88ea4a29f271d82c55
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/core/lib/ajax.lib.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/fourn/ajax/getSupplierPrices.php
Log Message:
-----------
FIX #3661 Margin is not selected correctly when adding a product
Commit: f3421bcf6d6f67803840143fa9c1108c3127d80e
https://github.com/Dolibarr/dolibarr/commit/f3421bcf6d6f67803840143fa9c1108c3127d80e
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
M htdocs/core/lib/admin.lib.php
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: e26940ddf79e426a563d902f10bb1a95a3b7fe7a
https://github.com/Dolibarr/dolibarr/commit/e26940ddf79e426a563d902f10bb1a95a3b7fe7a
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/fourn/ajax/getSupplierPrices.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/list.php
R htdocs/install/filelist.xml
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/langs/en_US/margins.lang
M htdocs/societe/price.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/filelist.xml
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/societe/price.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/a7795f25fc73...e26940ddf79e