[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 875d1d: Merge remote-tracking branch
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 875d1d: Merge remote-tracking branch 'refs/remotes/Dolibar... |
Date: |
Thu, 03 Dec 2015 02:48:10 -0800 |
Branch: refs/heads/3.8
Home: https://github.com/Dolibarr/dolibarr
Commit: 875d1d078d24fe4c0828f26a93cc739d7e45df87
https://github.com/Dolibarr/dolibarr/commit/875d1d078d24fe4c0828f26a93cc739d7e45df87
Author: fappels <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M htdocs/admin/dict.php
M htdocs/compta/facture.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/modules/mailings/modules_mailings.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/commande/orderstoinvoice.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/main.lang
M htdocs/main.inc.php
M htdocs/product/class/product.class.php
M htdocs/product/document.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/public/emailing/mailing-read.php
M htdocs/societe/price.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8
Commit: d36a4632212e11f2c60202568456756ac2ea2fa0
https://github.com/Dolibarr/dolibarr/commit/d36a4632212e11f2c60202568456756ac2ea2fa0
Author: fappels <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
M htdocs/comm/action/card.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal/list.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/ajax/getSupplierPrices.php
M htdocs/fourn/facture/card.php
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/product/stock/product.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8
Commit: 38957f7fb77a6ba9da18fecb9c2e87a6a4bc04ef
https://github.com/Dolibarr/dolibarr/commit/38957f7fb77a6ba9da18fecb9c2e87a6a4bc04ef
Author: fappels <address@hidden>
Date: 2015-11-29 (Sun, 29 Nov 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
M dev/initdata/savedemo.sh
M htdocs/.gitignore
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/list.php
M htdocs/admin/company.php
M htdocs/admin/menus/edit.php
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/localtax/card.php
M htdocs/core/boxes/box_project.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/dolgeoip.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modPropale.class.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/pgsql/functions/functions.sql
M htdocs/margin/agentMargins.php
M htdocs/margin/lib/margins.lib.php
M htdocs/product/card.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8
Commit: 4a0ea9777239108a32bf6aad2f4a1b513f3b612f
https://github.com/Dolibarr/dolibarr/commit/4a0ea9777239108a32bf6aad2f4a1b513f3b612f
Author: fappels <address@hidden>
Date: 2015-11-29 (Sun, 29 Nov 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
FIX #3953 rounding of buying price
fix javascript for rounding of buying price
Commit: 7bad058f47b245868287dd7faeed4ea7c6175d45
https://github.com/Dolibarr/dolibarr/commit/7bad058f47b245868287dd7faeed4ea7c6175d45
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge pull request #4114 from fappels/3.8_fix_round_buyprice
FIX #3953 rounding of buying price
Compare:
https://github.com/Dolibarr/dolibarr/compare/e6806611a63c...7bad058f47b2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 875d1d: Merge remote-tracking branch 'refs/remotes/Dolibar...,
Laurent Destailleur <=