497 Commits

Author	SHA1	Message	Date
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
Laurent Destailleur	01058be44c	NEW Introduce a "code" into fiels to describe vat. This will allow to ... suggest different vat lines with same value with ability to differentiate them.	2015-11-14 17:53:58 +01:00
Laurent Destailleur	ab177b43af	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php	2015-11-13 12:35:10 +01:00
Laurent Destailleur	93be4305c4	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: build/makepack-dolibarr.pl htdocs/accountancy/customer/card.php htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/card.php htdocs/accountancy/supplier/list.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/fichinter/card.php htdocs/societe/rib.php	2015-11-13 12:18:46 +01:00
Laurent Destailleur	7a0206adce	FIX Missing to set context into workflow actions, so triggers can't know ... we are creating an invoice from order or an order from a proposal.	2015-11-08 14:37:50 +01:00
Sergio Sanchis Climent	6b01db5960	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2015-11-06 02:08:55 +01:00
Sergio Sanchis Climent	de8e7107ee	Maintain origin_id and origin for copy document ... Fix any errors.	2015-11-06 01:53:20 +01:00
Laurent Destailleur	04664c203d	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php	2015-11-05 22:13:08 +01:00
Laurent Destailleur	58cac2d895	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php	2015-11-05 22:09:54 +01:00
Laurent Destailleur	fe78996026	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/commande/class/commande.class.php htdocs/product/stock/fiche.php htdocs/product/stock/valo.php	2015-11-05 22:04:18 +01:00
Laurent Destailleur	5777c16b72	Merge pull request #3902 from altatof/clonedorderdate ... FIX: change order date on clone (as everywhere else)	2015-11-05 21:49:50 +01:00
Christophe Battarel	80d2445540	FIX: bad stock valorisation	2015-11-05 17:00:22 +01:00
Christophe Battarel	ad82135879	FIX: change order date on clone (as everywhere else)	2015-11-05 15:36:13 +01:00
Sergio Sanchis Climent	f6991dd3ec	Moving new fields at the end	2015-11-04 23:18:28 +01:00
Sergio Sanchis Climent	eba0fa1b96	When you create an "commande" from a "propal" lost $object->origin and $object->origin_id in hook	2015-11-04 22:38:45 +01:00
Laurent Destailleur	a7795f25fc	Fix Must make a difference between a buying/cost price == '' (not ... provided) and buying/cost price = '0'. We must use default value only if value is '' and not if forced to '0'.	2015-11-04 17:51:15 +01:00
Laurent Destailleur	da0aa2f937	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php htdocs/langs/en_US/main.lang htdocs/product/list.php htdocs/product/stock/mouvement.php	2015-11-02 19:31:42 +01:00