[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] ddbd6c: MERGE DEGUEU
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] ddbd6c: MERGE DEGUEU |
Date: |
Sat, 15 Apr 2017 07:28:33 -0700 |
Branch: refs/heads/5.0
Home: https://github.com/Dolibarr/dolibarr
Commit: ddbd6c371d08c09018149eca014242f1f98bb70d
https://github.com/Dolibarr/dolibarr/commit/ddbd6c371d08c09018149eca014242f1f98bb70d
Author: arnaud <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M build/pad/DoliWamp.pml
M build/pad/Dolibarr.pml
M build/pad/pad_dolibarr.xml
M build/pad/pad_doliwamp.xml
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
Log Message:
-----------
MERGE DEGUEU
Commit: ef7a334414b07a203d86f802a7904b1e6ef19c66
https://github.com/Dolibarr/dolibarr/commit/ef7a334414b07a203d86f802a7904b1e6ef19c66
Author: arnaud <address@hidden>
Date: 2017-04-04 (Tue, 04 Apr 2017)
Changed paths:
M ChangeLog
M build/debian/conf.php.install
M htdocs/admin/dict.php
M htdocs/admin/system/constall.php
M htdocs/admin/system/dolibarr.php
M htdocs/comm/action/index.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/remx.php
M htdocs/commande/list.php
M htdocs/compta/bank/categ.php
M htdocs/compta/localtax/clients.php
M htdocs/conf/conf.php.example
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/extrafieldsinexport.inc.php
M htdocs/core/filemanagerdol/connectors/php/config.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/product/mod_codeproduct_elephant.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/filefunc.inc.php
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/margin/agentMargins.php
M htdocs/master.inc.php
M htdocs/product/admin/price_rules.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/projet/class/project.class.php
M htdocs/societe/consumption.php
M htdocs/viewimage.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dolibarr
Commit: 6b2d8a3c34e911de4f110ae512d33565178c92ed
https://github.com/Dolibarr/dolibarr/commit/6b2d8a3c34e911de4f110ae512d33565178c92ed
Author: arnaud <address@hidden>
Date: 2017-04-06 (Thu, 06 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
FIX limit+1 dosn't show Total line
Commit: 44302f1aea23de6bcc53dd476ed29a7e1b7bb600
https://github.com/Dolibarr/dolibarr/commit/44302f1aea23de6bcc53dd476ed29a7e1b7bb600
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-06 (Thu, 06 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge pull request #6650 from atm-arnaud/FIX_total_line_on_list_facture
Fix total line on list facture
Commit: 6f4ce8dc2fd8c26ab1a1799c80575d52a201343f
https://github.com/Dolibarr/dolibarr/commit/6f4ce8dc2fd8c26ab1a1799c80575d52a201343f
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-12 (Wed, 12 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 4.0
Commit: 086fa4385f73b9da3ba2903f055ecc1e9cfab1b6
https://github.com/Dolibarr/dolibarr/commit/086fa4385f73b9da3ba2903f055ecc1e9cfab1b6
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/install/repair.php
Log Message:
-----------
Fix clean of product_batch
Commit: 2e759d51562f87b00c28bf1a7572806d9612cd33
https://github.com/Dolibarr/dolibarr/commit/2e759d51562f87b00c28bf1a7572806d9612cd33
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 72ff353e9f48ccf01b7eb6ead491595258763b18
https://github.com/Dolibarr/dolibarr/commit/72ff353e9f48ccf01b7eb6ead491595258763b18
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/install/repair.php
Log Message:
-----------
Fix repair of product_stock
Commit: 7fe66581f15f8d3b2552f8bfb455d62b2210e906
https://github.com/Dolibarr/dolibarr/commit/7fe66581f15f8d3b2552f8bfb455d62b2210e906
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/install/repair.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: d2173c1fa4a199178713ba8c43f19e1038a07b43
https://github.com/Dolibarr/dolibarr/commit/d2173c1fa4a199178713ba8c43f19e1038a07b43
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/admin/dict.php
M htdocs/compta/facture.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/contact/list.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/facture/card.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/card.php
M htdocs/user/agenda_extsites.php
M htdocs/user/bank.php
M htdocs/user/card.php
M htdocs/user/clicktodial.php
M htdocs/user/document.php
M htdocs/user/info.php
M htdocs/user/ldap.php
M htdocs/user/note.php
M htdocs/user/param_ihm.php
M htdocs/user/perms.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: ac884ec463ea480049ec34f644a4228dfd839e11
https://github.com/Dolibarr/dolibarr/commit/ac884ec463ea480049ec34f644a4228dfd839e11
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/install/repair.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/install/repair.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/d99de641e835...ac884ec463ea