3690 Commits

Author	SHA1	Message	Date
Laurent Destailleur	88e76dcf64	Fix utf8 encoded twice	2015-11-28 14:40:23 +01:00
Laurent Destailleur	b47dbc7a5f	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/install/pgsql/functions/functions.sql htdocs/projet/element.php	2015-11-26 01:32:21 +01:00
Marcos García	a30f7d543a	Corrected fix	2015-11-25 10:19:11 +01:00
Laurent Destailleur	2a345b6fc0	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/admin/company.php htdocs/admin/menus/edit.php htdocs/core/class/hookmanager.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php	2015-11-21 12:48:41 +01:00
Marcos García de La Fuente	e8fc5f0d3a	FIX #3987 Undefined variable $newref in CommandeFournisseur::approve	2015-11-21 11:00:56 +01:00
Laurent Destailleur	835700bb25	Merge pull request #4006 from marcosgdf/bug-3989 ... FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl	2015-11-16 23:42:38 +01:00
Laurent Destailleur	04ffe1c7f0	Merge pull request #4005 from marcosgdf/bug-3988 ... FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline	2015-11-16 23:42:04 +01:00
Alexis Algoud	55b23c4918	FIX add billed field in supplier order	2015-11-16 14:55:46 +01:00
Marcos García de La Fuente	53fb085766	Corrected indent	2015-11-16 13:29:37 +01:00
Marcos García de La Fuente	ec7e4cb3d4	FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl	2015-11-16 13:25:00 +01:00
Marcos García de La Fuente	0880b13142	FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline	2015-11-16 13:24:11 +01:00
Marcos García de La Fuente	be460b6cbf	FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be	2015-11-16 13:20:56 +01:00
Laurent Destailleur	6bd6be0912	Debug and rename experimental module "supplier proposal". Still work to ... do: Must fix the PDF to be compliant with a request quotation to a supplier (so no need to show vat, unit price, ...).	2015-11-15 19:23:39 +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	b2285ca5e0	Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default. ... All emails sent from Dolibarr have a dedicated tracking id.	2015-11-12 21:25:01 +01:00
Laurent Destailleur	096ec3100d	Merge pull request #3926 from frederic34/fccard ... allow chaining and remove header exit	2015-11-08 15:49:33 +01:00
Juanjo Menent	f15e83e918	Merge pull request #3937 from marcosgdf/bug-3877 ... FIX #3877 HTML encoded strings when searching for a supplier invoice	2015-11-08 11:19:49 +01:00
Laurent Destailleur	3906cb79c5	NEW: Add parameter to add a link to use "date of invoice" in one click ... when fille a payment card.	2015-11-07 23:46:07 +01:00
Marcos García de La Fuente	ba42a7779f	FIX #3877 HTML encoded strings when searching for a supplier invoice ... Close #3877	2015-11-07 14:34:26 +01:00
frederic34	7349862b64	translations	2015-11-07 11:19:31 +01:00
frederic34	a597d6c379	allow chaining	2015-11-07 10:23:56 +01:00
frederic34	becce332dd	allow chaining and remove header exit	2015-11-07 09:52:00 +01:00
Laurent Destailleur	4bb21fd218	Merge pull request #3884 from FHenry/3.8 ... FIX #3880	2015-11-05 02:32:32 +01:00
Laurent Destailleur	e26940ddf7	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/core/lib/admin.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/install/filelist.xml htdocs/install/mysql/migration/3.8.0-3.9.0.sql htdocs/societe/price.php	2015-11-05 01:50:30 +01:00
Laurent Destailleur	77371af35a	FIX #3661 Margin is not selected correctly when adding a product	2015-11-05 01:08:30 +01:00
Florian HENRY	876ab4bb59	FIX : #3882	2015-11-04 18:30:09 +01:00
Florian HENRY	d4ee183662	FIX : 3880	2015-11-04 18:21:59 +01:00
Laurent Destailleur	df4f09e72f	FIX #3240	2015-11-03 14:02:36 +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
Laurent Destailleur	d8796e4cc7	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/product/stats/commande.php htdocs/product/stats/commande_fournisseur.php htdocs/product/stats/facture.php htdocs/product/stats/facture_fournisseur.php htdocs/product/stats/propal.php	2015-11-02 19:25:51 +01:00
Laurent Destailleur	a9ddcc1a80	Merge pull request #3832 from frederic34/patch-16 ... NEW Add supplier order to the Direct Printing System	2015-11-02 11:27:00 +01:00
Laurent Destailleur	72915aa16d	Merge pull request #3784 from All-3kcis/develop-patch-11 ... NEW Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE"	2015-11-02 11:23:49 +01:00
All-3kcis	a658ff7e90	add commit or rollback if error	2015-11-02 10:26:07 +01:00
Laurent Destailleur	2c682022cf	NEW The search box and the bookmarks are now rendered by the menu ... manager.	2015-10-30 09:36:57 +01:00
Laurent Destailleur	6cc3df7e71	NEW Quick searh filter works on invoice, proposal, order, intervention, ... contract	2015-10-30 08:35:56 +01:00
Frédéric FRANCE	ff9648eed9	Update card.php	2015-10-29 19:09:37 +01:00
fmarcet	310ecb1e09	FIX: Show product image on getNomUrl()	2015-10-29 12:28:28 +01:00
atm-robin	29b8919a40	FIX supplier rights for orderToInvoice	2015-10-26 14:34:46 +01:00
Laurent Destailleur	1f1e72f2b6	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/fourn/facture/list.php htdocs/main.inc.php	2015-10-25 19:54:41 +01:00
Maxime Kohlhaas	ef2337a338	Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 ... Conflicts: htdocs/compta/facture/list.php	2015-10-22 14:41:58 +02:00
All-3kcis	00c2b1a32a	move db->begin() before trigger	2015-10-22 14:30:11 +02:00
All-3kcis	ceae04b76e	move trigger before query	2015-10-22 12:03:01 +02:00
Laurent Destailleur	f312ee58de	Merge pull request #3779 from All-3kcis/develop-patch-10 ... Correct return value	2015-10-22 10:35:55 +02:00
Laurent Destailleur	474692e71a	Remove duplicate page fourn/list.php	2015-10-22 09:48:16 +02:00
Frédéric FRANCE	4689b0cc11	Update fournisseur.commande.class.php	2015-10-21 17:31:51 +02:00
All-3kcis	ca8c1adf55	Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for frounisseur.product remove_product_fournisseur_price()	2015-10-21 10:07:53 +02:00
All-3kcis	3cb2637f25	Correct return value	2015-10-20 09:42:02 +02:00
Laurent Destailleur	22979523db	Try a fix for #3742	2015-10-20 02:34:53 +02:00