[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 30d58f: FIX : forgotten parameter for
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 30d58f: FIX : forgotten parameter for right multicompany u... |
|
Date: |
Fri, 05 May 2017 05:53:55 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 30d58f77db555c807251c4dfe1e0eb7ba1a7d486
https://github.com/Dolibarr/dolibarr/commit/30d58f77db555c807251c4dfe1e0eb7ba1a7d486
Author: gauthier <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/contact/document.php
Log Message:
-----------
FIX : forgotten parameter for right multicompany use
Commit: 8a373b25ba04c33300ccd38fc5b02ad5c0ce1bd2
https://github.com/Dolibarr/dolibarr/commit/8a373b25ba04c33300ccd38fc5b02ad5c0ce1bd2
Author: gauthier <address@hidden>
Date: 2017-04-11 (Tue, 11 Apr 2017)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
FIX : global $dateSelector isn't the good one, then date selector on
objectline_create tpl was hidden
Commit: 396ea5489419f61b936510c49b010e6abb95974e
https://github.com/Dolibarr/dolibarr/commit/396ea5489419f61b936510c49b010e6abb95974e
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-04-12 (Wed, 12 Apr 2017)
Changed paths:
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Subprice was null in supplier proposal and line was not transfered to
supplier order
Commit: 3a8608db19c29c14416918e334b79d72214d7b48
https://github.com/Dolibarr/dolibarr/commit/3a8608db19c29c14416918e334b79d72214d7b48
Author: Juanjo Menent <address@hidden>
Date: 2017-04-16 (Sun, 16 Apr 2017)
Changed paths:
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Merge pull request #6697 from atm-maxime/fix_supp_prop_subprice
Fix Subprice was null in supplier proposal and line was not transfered to…
Commit: e23a44bcdf49d8e15062ec04d233ae3968604db1
https://github.com/Dolibarr/dolibarr/commit/e23a44bcdf49d8e15062ec04d233ae3968604db1
Author: Christian Seiler <address@hidden>
Date: 2017-04-16 (Sun, 16 Apr 2017)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Added missing Slashes
fixed line where two slashes were missing, that caused an error when creating
barcodes.
Commit: 9bbfeed1bcde075a8e5d545dfab9862aca9837f8
https://github.com/Dolibarr/dolibarr/commit/9bbfeed1bcde075a8e5d545dfab9862aca9837f8
Author: Juanjo Menent <address@hidden>
Date: 2017-04-16 (Sun, 16 Apr 2017)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Merge pull request #6722 from Christian-Seiler/3.9
Fix #5911 Added missing Slashes
Commit: 433b9e6fe17840ba401415bff7d4f62d1200cec0
https://github.com/Dolibarr/dolibarr/commit/433b9e6fe17840ba401415bff7d4f62d1200cec0
Author: fappels <address@hidden>
Date: 2017-04-18 (Tue, 18 Apr 2017)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix typo in en_US admin tag
Commit: 54256773c558f5599a2111c6010fc1ab1a8f6335
https://github.com/Dolibarr/dolibarr/commit/54256773c558f5599a2111c6010fc1ab1a8f6335
Author: hugome <address@hidden>
Date: 2017-04-21 (Fri, 21 Apr 2017)
Changed paths:
M htdocs/core/lib/accounting.lib.php
Log Message:
-----------
FIX: length_accounta return variable name
Commit: cd099bf3b1f02681176ec6e384825bb312e6ab32
https://github.com/Dolibarr/dolibarr/commit/cd099bf3b1f02681176ec6e384825bb312e6ab32
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-24 (Mon, 24 Apr 2017)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Fix bad update of prices
Commit: 587f5a76e6052e70e3c45f7dfa378d67925969a9
https://github.com/Dolibarr/dolibarr/commit/587f5a76e6052e70e3c45f7dfa378d67925969a9
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-24 (Mon, 24 Apr 2017)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: a2287fd1830083b998c5274212563c78bf5c1b44
https://github.com/Dolibarr/dolibarr/commit/a2287fd1830083b998c5274212563c78bf5c1b44
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-24 (Mon, 24 Apr 2017)
Changed paths:
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Add example of sql request to fix llx_product_price
Commit: 8f97177dae03aca9df07fc2171d32df608f04bee
https://github.com/Dolibarr/dolibarr/commit/8f97177dae03aca9df07fc2171d32df608f04bee
Author: florian HENRY <address@hidden>
Date: 2017-04-24 (Mon, 24 Apr 2017)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
Log Message:
-----------
FIX 6614
Commit: 4ab5674ffbbeb8af8ada5cc8c2a5b4b7ccd39bee
https://github.com/Dolibarr/dolibarr/commit/4ab5674ffbbeb8af8ada5cc8c2a5b4b7ccd39bee
Author: Quentin Vial-Gouteyron <address@hidden>
Date: 2017-04-25 (Tue, 25 Apr 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/ajax.lib.php
Log Message:
-----------
FIX ajax autocomplete on clone
Commit: 56e749df9f26a82dc988d9d3228b9f99966f8957
https://github.com/Dolibarr/dolibarr/commit/56e749df9f26a82dc988d9d3228b9f99966f8957
Author: Marc de Lima Lucio <address@hidden>
Date: 2017-04-26 (Wed, 26 Apr 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
FIX: supplier order line were always created with rang = 0
Commit: c69a1205c001b42ce9acaa7cdf62cc8c0f6caee4
https://github.com/Dolibarr/dolibarr/commit/c69a1205c001b42ce9acaa7cdf62cc8c0f6caee4
Author: fappels <address@hidden>
Date: 2017-04-26 (Wed, 26 Apr 2017)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Fix download delivery document
Commit: 18981ab0c9e9c716aa7d31cf9f6eafab3ff2cd23
https://github.com/Dolibarr/dolibarr/commit/18981ab0c9e9c716aa7d31cf9f6eafab3ff2cd23
Author: fappels <address@hidden>
Date: 2017-04-28 (Fri, 28 Apr 2017)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Fix download donation document
Commit: 05fe0d7fcdcefb15970d1a470e75c9e4187b54ec
https://github.com/Dolibarr/dolibarr/commit/05fe0d7fcdcefb15970d1a470e75c9e4187b54ec
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-29 (Sat, 29 Apr 2017)
Changed paths:
M htdocs/includes/odtphp/Segment.php
M htdocs/includes/odtphp/odf.php
Log Message:
-----------
Fix doxygen
Commit: 04b1535b12e8ec2049b4a73a5a614f8642fdfbf3
https://github.com/Dolibarr/dolibarr/commit/04b1535b12e8ec2049b4a73a5a614f8642fdfbf3
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-29 (Sat, 29 Apr 2017)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/langs/en_US/errors.lang
Log Message:
-----------
FIX Found duplicate line when it is not.
Commit: c9bfb6e945e248d4953100378b0d40e48c6ba32f
https://github.com/Dolibarr/dolibarr/commit/c9bfb6e945e248d4953100378b0d40e48c6ba32f
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-29 (Sat, 29 Apr 2017)
Changed paths:
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
Log Message:
-----------
FIX Several bugs in accounting module.
Commit: 04c05efafed4f83c786adae2883f7e1709b60cca
https://github.com/Dolibarr/dolibarr/commit/04c05efafed4f83c786adae2883f7e1709b60cca
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-29 (Sat, 29 Apr 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/expensereportsjournal.php
Log Message:
-----------
FIX Several bugs in accounting module.
Commit: cc8e66d079d66d94c3703fefe1c2fc9de48223b7
https://github.com/Dolibarr/dolibarr/commit/cc8e66d079d66d94c3703fefe1c2fc9de48223b7
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-29 (Sat, 29 Apr 2017)
Changed paths:
M htdocs/compta/bank/index.php
Log Message:
-----------
FIX Journal code of bank must be visible of accountaing module on.
Commit: 50d65e3a9fcaa4c667a4101dd58de632df92c064
https://github.com/Dolibarr/dolibarr/commit/50d65e3a9fcaa4c667a4101dd58de632df92c064
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-29 (Sat, 29 Apr 2017)
Changed paths:
M htdocs/core/lib/functions2.lib.php
M htdocs/install/mysql/migration/repair.sql
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/install/mysql/migration/repair.sql
Commit: fd729775051fabe6d045c6035f87fab9ae0946c5
https://github.com/Dolibarr/dolibarr/commit/fd729775051fabe6d045c6035f87fab9ae0946c5
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-29 (Sat, 29 Apr 2017)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge pull request #6690 from atm-gauthier/FIX_dateSelector
FIX : global $dateSelector isn't the good one, then date selector on …
Commit: 166f2d262d7d3c4664ae1eb21d3f597906e3daa0
https://github.com/Dolibarr/dolibarr/commit/166f2d262d7d3c4664ae1eb21d3f597906e3daa0
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-05-02 (Tue, 02 May 2017)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Corrected PHP7 warnings for function CommonObject::getTotalWeightVolume
Commit: 6e7fddee7d10cc2244f42a9d80f3eb5c6fe386ad
https://github.com/Dolibarr/dolibarr/commit/6e7fddee7d10cc2244f42a9d80f3eb5c6fe386ad
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-05-02 (Tue, 02 May 2017)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Corrected PHP7 warnings for function pdf_einstein::write_file
Commit: 7ae405a254fb028b735faa9191a19529b8b7d5a7
https://github.com/Dolibarr/dolibarr/commit/7ae405a254fb028b735faa9191a19529b8b7d5a7
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-05-02 (Tue, 02 May 2017)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
Log Message:
-----------
Corrected PHP7 warnings for several PDF document models
Commit: 3917bdfc7941e4dad37ddfc65383bcc44f62e3d1
https://github.com/Dolibarr/dolibarr/commit/3917bdfc7941e4dad37ddfc65383bcc44f62e3d1
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-02 (Tue, 02 May 2017)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/societe/soc.php
Log Message:
-----------
Fix vat_src_code propagation.
Commit: 98b2e83bfb657b3528c028c31f8945afd56e4062
https://github.com/Dolibarr/dolibarr/commit/98b2e83bfb657b3528c028c31f8945afd56e4062
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-03 (Wed, 03 May 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix localtaxes type not retrieved in proposals. Fixes Dolibarr/dolibarr/#6786
Commit: f63f28c7febedd41e200c5274d2925494f7b1935
https://github.com/Dolibarr/dolibarr/commit/f63f28c7febedd41e200c5274d2925494f7b1935
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-03 (Wed, 03 May 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Fix vat_src_code propagation between post types
Commit: b93df2d6b5af7d0e7c5d185e62a27ef0a418dc8b
https://github.com/Dolibarr/dolibarr/commit/b93df2d6b5af7d0e7c5d185e62a27ef0a418dc8b
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-03 (Wed, 03 May 2017)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fixes localtax propagation to new invoice
Commit: 421843e693c5c948c86bfb1d214c3cdee7dd4cdb
https://github.com/Dolibarr/dolibarr/commit/421843e693c5c948c86bfb1d214c3cdee7dd4cdb
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-03 (Wed, 03 May 2017)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Fix missing localtaxes lines in "commande" PDF
Commit: 909b489d1f9fb74f4c9680e6a9fb0ff46c8797e8
https://github.com/Dolibarr/dolibarr/commit/909b489d1f9fb74f4c9680e6a9fb0ff46c8797e8
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/commande/card.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
More fixes regarding localtaxes not being diplayed in generated PDF and
vat_src_code not being propagating properly when generating posts from type to
type.
Commit: 85bf4b742b15ca267431530cb8eb3ab932002d18
https://github.com/Dolibarr/dolibarr/commit/85bf4b742b15ca267431530cb8eb3ab932002d18
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Fix typo
Commit: 4adfe6de70a7da88410deb9d71dcf1607d2f732f
https://github.com/Dolibarr/dolibarr/commit/4adfe6de70a7da88410deb9d71dcf1607d2f732f
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/contact/document.php
Log Message:
-----------
Merge pull request #6725 from atm-gauthier/FIX_restrictedarea_document_contact
FIX : forgotten parameter for right multicompany use
Commit: 6fb8876e5aa49a99d539aabf6a074db37427a963
https://github.com/Dolibarr/dolibarr/commit/6fb8876e5aa49a99d539aabf6a074db37427a963
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge pull request #6730 from fappels/5.0_fix_en_US_admin_tag
Fix typo in en_US admin tag
Commit: ee039c69a8bf1032c3dbd32b79b5b7a833c32f95
https://github.com/Dolibarr/dolibarr/commit/ee039c69a8bf1032c3dbd32b79b5b7a833c32f95
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/contact/document.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 1096177ccec8a711cc211df28d851512bae25b52
https://github.com/Dolibarr/dolibarr/commit/1096177ccec8a711cc211df28d851512bae25b52
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 8009370f041a71d2cdccd04c1152c38c7549bce6
https://github.com/Dolibarr/dolibarr/commit/8009370f041a71d2cdccd04c1152c38c7549bce6
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/core/lib/functions2.lib.php
M htdocs/install/mysql/migration/repair.sql
M htdocs/product/admin/product_tools.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/contact/document.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/repair.sql
Commit: 81d696300ca23e770e2c51b69dd60a3a1fc3fe08
https://github.com/Dolibarr/dolibarr/commit/81d696300ca23e770e2c51b69dd60a3a1fc3fe08
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 270c3db32ebc861d6714321465a5379f4f6d71d0
https://github.com/Dolibarr/dolibarr/commit/270c3db32ebc861d6714321465a5379f4f6d71d0
Author: David <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/comm/propal/class/api_proposals.class.php
Log Message:
-----------
fix params order for tha addline() function
please check to last param "$request_data->fk_remise_except", I couldn't find a
corresponding parameter name in the addline() function
Commit: 8318ebc1096d464b6427d0812c6d32c79265b233
https://github.com/Dolibarr/dolibarr/commit/8318ebc1096d464b6427d0812c6d32c79265b233
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/comm/propal/class/api_proposals.class.php
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix missing field into addline of proposals
Commit: 88917afa08ae56ef38864c1f0e29b98698a9f74f
https://github.com/Dolibarr/dolibarr/commit/88917afa08ae56ef38864c1f0e29b98698a9f74f
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/core/lib/accounting.lib.php
Log Message:
-----------
Merge pull request #6740 from Hugome/fix-length_accounta
FIX: length_accounta return variable name
Commit: 944cd40ef4de1176c462335177a4c23fa62eaafe
https://github.com/Dolibarr/dolibarr/commit/944cd40ef4de1176c462335177a4c23fa62eaafe
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
Log Message:
-----------
Merge pull request #6749 from atm-florian/5.0_fix6614
FIX #6614
Commit: 2de335e2dc29194671f67eb4146bbdf3ba447e5c
https://github.com/Dolibarr/dolibarr/commit/2de335e2dc29194671f67eb4146bbdf3ba447e5c
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Action must be a verb
Commit: 089b8820333e192e83ef723ce3d518b78d0ea4cc
https://github.com/Dolibarr/dolibarr/commit/089b8820333e192e83ef723ce3d518b78d0ea4cc
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/ajax.lib.php
Log Message:
-----------
Merge pull request #6755 from atm-quentin/fix_ajax_autocomplete_clone
FIX ajax autocomplete on clone
Commit: 0c9f268f99279aa14d13d898ef5d89e15259ccd1
https://github.com/Dolibarr/dolibarr/commit/0c9f268f99279aa14d13d898ef5d89e15259ccd1
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #6759 from ATM-Marc/FIX_supplier_order_rang
FIX supplier order line creation with rang = 0
Commit: 24a2fb57ea3359d0dc6f04731149c41ab813b3e1
https://github.com/Dolibarr/dolibarr/commit/24a2fb57ea3359d0dc6f04731149c41ab813b3e1
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/comm/propal/class/api_proposals.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/en_US/admin.lang
M htdocs/product/admin/product_tools.php
M htdocs/societe/soc.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Resolved merge conflict
Commit: a1e92467947074c5feef8d2199b6177be4c7cb4b
https://github.com/Dolibarr/dolibarr/commit/a1e92467947074c5feef8d2199b6177be4c7cb4b
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Resolved merge conflict [2]
Commit: f32d19fb73abdbe2cfed02ef37af34dc473eca6e
https://github.com/Dolibarr/dolibarr/commit/f32d19fb73abdbe2cfed02ef37af34dc473eca6e
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/tables/llx_events.sql
Log Message:
-----------
FIX #6767 serious critical error no login possible
Commit: 382fcb53fa2dc036cd795574949a1ad1e5ea7e4e
https://github.com/Dolibarr/dolibarr/commit/382fcb53fa2dc036cd795574949a1ad1e5ea7e4e
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/ajax.lib.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: db8c4a5ac41401be27a6c5cd2c83b9a642411e22
https://github.com/Dolibarr/dolibarr/commit/db8c4a5ac41401be27a6c5cd2c83b9a642411e22
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Merge pull request #6760 from fappels/4.0_fix_download_delivery_doc
Fix download delivery and donation document
Commit: 4b8cda2070818bf450b5f1eceae1385b1792fdb3
https://github.com/Dolibarr/dolibarr/commit/4b8cda2070818bf450b5f1eceae1385b1792fdb3
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #6791 from Gecka-Apps/5.0
Fix major issues with local taxes
Commit: 9785e9b2988529c3e8bd626828866a7dd1194ce7
https://github.com/Dolibarr/dolibarr/commit/9785e9b2988529c3e8bd626828866a7dd1194ce7
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Update commonobject.class.php
Commit: 938d33941dfe992668d2599c5cfd53ec8235d7a3
https://github.com/Dolibarr/dolibarr/commit/938d33941dfe992668d2599c5cfd53ec8235d7a3
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/core/class/commonobject.class.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/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge pull request #6780 from marcosgdf/php7-warnings
Corrected PHP7 warnings for several pages
Commit: 8a37eeea743259c04eb43ebc8062db2734babc93
https://github.com/Dolibarr/dolibarr/commit/8a37eeea743259c04eb43ebc8062db2734babc93
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: e830ea671405c1afcf53cc29563fb9a6288d51e2
https://github.com/Dolibarr/dolibarr/commit/e830ea671405c1afcf53cc29563fb9a6288d51e2
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/files.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/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 2120b9af85a3f75e5bcae3eaac1ad973dbf557fd
https://github.com/Dolibarr/dolibarr/commit/2120b9af85a3f75e5bcae3eaac1ad973dbf557fd
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/files.lib.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/theme/eldy/style.css.php
Commit: eb2124bfc896b9bd62a8016f4a40244d219ff16b
https://github.com/Dolibarr/dolibarr/commit/eb2124bfc896b9bd62a8016f4a40244d219ff16b
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 11b1a2adac60cf40807dd0c6d814cd7fd17f7e82
https://github.com/Dolibarr/dolibarr/commit/11b1a2adac60cf40807dd0c6d814cd7fd17f7e82
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/expensereportsjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/class/api_proposals.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/index.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/includes/odtphp/Segment.php
M htdocs/includes/odtphp/odf.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_events.sql
M htdocs/langs/en_US/main.lang
M htdocs/product/admin/product_tools.php
M htdocs/societe/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/b7f7683e5a1c...11b1a2adac60