513 Commits

Author	SHA1	Message	Date
Laurent Destailleur	8a6d97f257	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-21 02:39:37 +02:00
Laurent Destailleur	ffd10a7560	Complete function loadExpedition to add filter on fk_product	2016-04-21 02:38:49 +02:00
Laurent Destailleur	1e5ff7388c	Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client ... NEW Removed deprecated CommonObject::client property	2016-04-21 01:49:12 +02:00
nka11	4eb1aa59aa	fix coding rules	2016-04-18 19:11:28 +02:00
Marcos García de La Fuente	e2c86d3fd8	NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead	2016-04-17 15:24:22 +02:00
nka11	9ced1dc008	fixing some style and renaming Account to User API	2016-04-11 23:27:43 +02:00
nka11	e5a447c148	Adding more line features (PUT, DELETE, POST)	2016-04-11 22:41:35 +02:00
nka11	1fdcd0e859	Fixed bugs in order api. Added method for posting new lines in order	2016-04-11 18:07:02 +02:00
nka11	132cdd9ed4	Fix coding style errors	2016-04-10 14:15:38 +02:00
nka11	65e4273fdf	Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev	2016-04-10 14:00:00 +02:00
nka11	d0356d6bd0	new api class for accounts, filtering on order api	2016-04-10 13:57:53 +02:00
Laurent Destailleur	dd1f946afe	Clean dead code	2016-04-09 19:06:40 +02:00
Laurent Destailleur	27217ccccd	Maxi debug of supplier order workflow. ... Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED Parameter user is added so it is defined into triggers.	2016-04-09 18:51:09 +02:00
Scrutinizer Auto-Fixer	c2243909e9	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-04-09 13:07:33 +00:00
Laurent Destailleur	281b06a2d3	NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and ... MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.	2016-04-01 18:44:23 +02:00
Laurent Destailleur	d14f3d7e2b	FIX When deleting last shipment, status "shipment in progress" of order ... must move back to status "validated".	2016-04-01 16:59:08 +02:00
Laurent Destailleur	ba4f5c8648	Merge remote-tracking branch 'origin/3.9' into develop	2016-03-19 19:26:57 +01:00
Laurent Destailleur	ee857055be	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-03-19 19:26:25 +01:00
Laurent Destailleur	660f825a34	Fix regression description line not visible	2016-03-19 19:25:28 +01:00
Laurent Destailleur	2b1f57f01e	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: dev/initdata/savedemo.sh htdocs/filefunc.inc.php htdocs/user/card.php	2016-03-18 11:54:14 +01:00
Laurent Destailleur	7fa71214bc	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php htdocs/core/modules/commande/doc/pdf_proforma.modules.php	2016-03-18 11:06:41 +01:00
fappels	437470c3d9	subprice should be unit price without tax	2016-03-14 17:27:12 +01:00
Laurent Destailleur	08c5fd2e36	FIX #4809 - Duplicate functions with different content	2016-03-14 14:38:30 +01:00
Laurent Destailleur	4fa84c8d8f	Merge pull request #4707 from marcosgdf/misc2 ... Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated	2016-03-10 13:21:51 +01:00
Laurent Destailleur	ba5b0efb53	The warning for late orders is visible on order card	2016-03-10 10:53:01 +01:00
Laurent Destailleur	d1777a6783	Replace function rand with mt_rand (prepare php 8)	2016-03-05 15:01:25 +01:00
Marcos García de La Fuente	66313f584b	Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated	2016-03-02 10:52:54 +01:00
Laurent Destailleur	8807222f24	Fix a lot of fixes to have the french vat npr working better	2016-02-27 12:22:39 +01:00
Laurent Destailleur	c86a1a30d5	Fix a lot of fixes to have the french vat npr working better	2016-02-27 11:46:16 +01:00
Laurent Destailleur	4b89b0b7aa	Fix bad status translation for shipment	2016-02-24 22:13:29 +01:00
Laurent Destailleur	6ee4637f35	Fix bad status translation for shipment	2016-02-24 22:12:38 +01:00
Laurent Destailleur	d3960b0809	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/lib/member.lib.php htdocs/expedition/card.php	2016-02-20 04:25:39 +01:00
Laurent Destailleur	761ad0114c	Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order ... New add multicurrency on supplier proposal/order	2016-02-19 03:36:23 +01:00
phf	e24a35b904	New add multicurrency on supplier proposal/order	2016-02-16 23:58:21 +01:00
phf	6d095fce9f	Fix replace dol_include_once() function by require_once for internal module	2016-02-16 20:44:23 +01:00
Laurent Destailleur	5ea9c6dd83	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/core/class/html.formprojet.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/filefunc.inc.php htdocs/langs/en_US/accountancy.lang	2016-02-09 14:40:25 +01:00
Laurent Destailleur	223195538a	Return bad late or not status for order	2016-02-09 14:29:12 +01:00
phf	373225272b	FIX reorder the display of currency and rate on propal/order ... FIX update line on propal/order NEW add mulitcurrency on customer invoice	2016-01-23 16:01:55 +01:00
phf	e86ebd6799	NEW add multicurency on customer order	2016-01-23 00:38:17 +01:00
Laurent Destailleur	8e882b4cc2	NEW Add warning on tasks when they are late (add also the warning ... tolerance parameter)	2016-01-18 15:56:51 +01:00
Laurent Destailleur	6f474c403c	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/product/list.php htdocs/societe/notify/card.php htdocs/societe/price.php	2015-12-27 19:15:20 +01:00
Laurent Destailleur	80989fd2c9	Merge pull request #4304 from marcosgdf/bug-4302 ... FIX #4302 Undefined variable $conf in Commande::LibStatut	2015-12-27 17:37:02 +01:00
Marcos García de La Fuente	98351d6fec	FIX #4302 Undefined variable $conf in Commande::LibStatut	2015-12-27 13:15:05 +01:00
Marcos García de La Fuente	67bdfa2617	FIX #4282 Defined shipping time were not shown in Customer order's PDF documents	2015-12-27 13:10:33 +01:00
Laurent Destailleur	5eea1ce7d9	Fix several warnings	2015-12-17 19:37:24 +01:00
Laurent Destailleur	a12e959833	Do not show billed status after order status	2015-11-29 16:33:50 +01:00
Laurent Destailleur	c55d11869b	Billing of supplier or customer order is a process that can be done in ... parallel with shipment or reception, so we show the status on another field into lists.	2015-11-29 15:54:32 +01:00
Frédéric FRANCE	47485b39ce	Update commande.class.php	2015-11-19 16:41:11 +01:00
Frédéric FRANCE	6c8ac1e95c	typo	2015-11-19 16:31:55 +01:00
Laurent Destailleur	388748055a	Fix missing translation for VAT	2015-11-15 15:08:54 +01:00