dolibarr

Author	SHA1	Message	Date
Tobias Sekan	d9a2d2b982	fix not working default values for payment	2020-05-22 08:00:26 +02:00
Frédéric FRANCE	b41ac00b98	add new rule	2020-05-21 15:05:19 +02:00
Tobias Sekan	44ffb8dbf7	Fix not working default value (re...)	2020-05-21 09:34:20 +02:00
Frédéric FRANCE	f5688b2eec	add new rule	2020-05-21 01:52:25 +02:00
altairis	55def0248c	fix missing rollbacks	2020-05-20 14:37:35 +02:00
Laurent Destailleur	2f7786f50f	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-20 10:37:43 +02:00
Laurent Destailleur	c5e341883d	Fix popup of supplier invoice	2020-05-19 23:22:40 +02:00
altairis	80c56b3017	manage stock on edit and delete dispatched lines	2020-05-19 15:59:03 +02:00
altairis	b79a30c0f9	edit and delete dispatched lines	2020-05-19 14:18:06 +02:00
Laurent Destailleur	a865dc7232	Merge pull request #13762 from indelog/rappaygroupmod NEW possibilty to group payments by mode and show their subtotal	2020-05-14 16:55:37 +02:00
Laurent Destailleur	4584fa1aa6	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/asset/list.php htdocs/compta/bank/list.php htdocs/contrat/services_list.php htdocs/core/lib/date.lib.php htdocs/expensereport/list.php htdocs/fichinter/list.php htdocs/holiday/list.php htdocs/projet/tasks/list.php htdocs/supplier_proposal/list.php htdocs/user/list.php	2020-05-11 19:43:06 +02:00
Maxime Kohlhaas	1a9afe6b20	Fix missing hook params for printFieldListValue	2020-05-08 01:40:25 +02:00
Tobias Sekan	3f5f6b3243	Fix lint errors	2020-05-06 12:09:39 +02:00
Tobias Sekan	468829aa70	Add new vendor invoice area page	2020-05-06 11:48:01 +02:00
Pierre Ardoin	c0b9fef229	Fix issue in status name Before : $commandestatic->LibStatut($obj->nb) shows bad value because bad param Now : $commandestatic->LibStatut($obj->fk_statut) shows good value.	2020-05-05 08:40:30 +02:00
Scrutinizer Auto-Fixer	8f0e00b4aa	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-05-02 01:39:56 +00:00
DEMAREST Maxime (Indelog)	740b2c9228	NEW possibilty to group payments by mode and show their subtotal This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments to group them by mode and get subtotals for each mode. Add the corresponding configuration options on admin page fore each payments and supplier payments.	2020-04-28 09:01:00 +02:00
Laurent Destailleur	1c70e49695	Merge branch 'develop' into 12.0_a23	2020-04-27 14:14:13 +02:00
Laurent Destailleur	31157931a9	Fix phpcs	2020-04-26 23:52:23 +02:00
Scrutinizer Auto-Fixer	1bf5745286	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-25 11:52:07 +00:00
Laurent Destailleur	1121d2c1c6	Look and feel v12	2020-04-25 13:49:44 +02:00
Laurent Destailleur	6b114a31ce	Look and feel v12	2020-04-25 03:00:41 +02:00
Laurent Destailleur	291664d109	Look and feel v12	2020-04-25 01:04:26 +02:00
Laurent Destailleur	3ed11f374a	Look and feel v12	2020-04-24 23:56:57 +02:00
Laurent Destailleur	d416edab1a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-24 22:50:09 +02:00
Laurent Destailleur	54d641020f	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/accounting-files.php	2020-04-24 22:49:59 +02:00
Laurent Destailleur	d11dcc35c3	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/core/class/commonobject.class.php	2020-04-24 19:56:19 +02:00
Laurent Destailleur	6798e9e6f5	Fix remove warning missing the seller in update_price	2020-04-24 19:52:54 +02:00
Laurent Destailleur	e84601f5ed	Merge pull request #13710 from TobiasSekan/FixMissingErrorOnCloneObject FIX not shown error on clone vendor invoice with ExtraFields	2020-04-24 19:01:42 +02:00
Laurent Destailleur	7bbfd2175d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/class/fournisseur.commande.dispatch.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/reception/class/reception.class.php	2020-04-24 18:58:47 +02:00
Laurent Destailleur	9764af7e9c	Merge pull request #13731 from simicar29/11.0-reception Clean line extrafields when deleting reception	2020-04-24 15:16:51 +02:00
stickler-ci	ababad540a	Fixing style errors.	2020-04-23 17:29:52 +00:00
Marc Guenneugues	b4fbb86548	Clean line extrafields when deleting reception	2020-04-23 19:22:25 +02:00
Laurent Destailleur	7f0e019c78	Merge pull request #13725 from simicar29/11.0-supplierorder Clean line extrafields when deleting supplier order	2020-04-23 18:56:09 +02:00
stickler-ci	4b58213e5b	Fixing style errors.	2020-04-23 16:29:36 +00:00
Marc Guenneugues	64d877bc7b	Clean line extrafields when deleting supplier order	2020-04-23 18:27:06 +02:00
stickler-ci	b5f48fb815	Fixing style errors.	2020-04-23 16:17:37 +00:00
Marc Guenneugues	039fe92209	Clean line extrafields when deleting supplier invoice	2020-04-23 18:14:56 +02:00
Laurent Destailleur	86be024dcc	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modFournisseur.class.php	2020-04-23 17:17:42 +02:00
Laurent Destailleur	72c6ac1c72	Complete #13708 , normalization of code	2020-04-23 13:21:39 +02:00
Laurent Destailleur	4475df14b4	Finish removal of duplicate hook/trigger	2020-04-23 12:54:28 +02:00
Laurent Destailleur	e1129babbc	Code comment	2020-04-23 12:44:30 +02:00
Laurent Destailleur	93278b2dca	FIX #13713	2020-04-23 12:42:03 +02:00
Sekan, Tobias	f793844862	Fix missing errror on facture clone	2020-04-23 11:04:14 +02:00
Frédéric FRANCE	8ed9c30a89	clean tab/whitespace	2020-04-22 09:02:02 +02:00
Laurent Destailleur	35b5ee28ef	Merge pull request #13680 from adrienjacob/patch-3 Add API endpoints for supplier invoice lines	2020-04-22 01:06:57 +02:00
Laurent Destailleur	ae519a1009	Update fournisseur.facture.class.php	2020-04-22 00:59:22 +02:00
stickler-ci	9f4d2ee881	Fixing style errors.	2020-04-21 14:11:33 +00:00
Adrien Jacob	23c2335396	Add API endpoints for supplier invoice lines	2020-04-21 16:07:49 +02:00
Sekan, Tobias	06556fe14c	indent + comments	2020-04-21 12:25:44 +02:00
Sekan, Tobias	7de4f4d0bb	Cleanup user rights on forun commande card	2020-04-21 12:13:15 +02:00
Sekan, Tobias	104e786a79	cleanup user rights on forun facture card	2020-04-21 10:02:18 +02:00
stickler-ci	d4a8718e6c	Fixing style errors.	2020-04-21 08:00:14 +00:00
Adrien Jacob	5353082154	FIX Delete extra fields for supplier invoice line	2020-04-21 09:57:45 +02:00
Laurent Destailleur	67a7d6b77d	Look and feel v12	2020-04-20 15:57:15 +02:00
Laurent Destailleur	16e46c672c	Clean code	2020-04-20 15:06:27 +02:00
stickler-ci	27aeaaecb5	Fixing style errors.	2020-04-20 14:42:13 +02:00
Adrien Jacob	91fbccb594	[BUGFIX] Allow update of extra fields This is to make supplier invoices consistent with other similar classes	2020-04-20 14:42:08 +02:00
stickler-ci	36385e3b88	Fixing style errors.	2020-04-20 12:16:34 +00:00
Adrien Jacob	68702f8053	[BUGFIX] Allow update of extra fields This is to make supplier invoices consistent with other similar classes	2020-04-20 14:12:08 +02:00
Laurent Destailleur	13eb1ca28d	Fix link	2020-04-18 04:40:33 +02:00
Laurent Destailleur	5254a94038	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/ldap.php htdocs/commande/class/commande.class.php htdocs/commande/index.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/expedition/list.php htdocs/fourn/commande/list.php htdocs/fourn/facture/list.php htdocs/loan/list.php htdocs/product/class/product.class.php htdocs/supplier_proposal/list.php	2020-04-16 15:58:59 +02:00
atm-quentin	f7c07640dd	viewstatut to search_status	2020-04-15 15:01:00 +02:00
Laurent Destailleur	596ba8d679	Clean deprecated code.	2020-04-13 01:10:35 +02:00
Laurent Destailleur	92b6b1a042	Look and feel v12	2020-04-12 18:13:43 +02:00
Laurent Destailleur	422e33a68b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/ihm.php htdocs/comm/action/class/actioncomm.class.php htdocs/compta/stats/cabyprodserv.php htdocs/filefunc.inc.php htdocs/takepos/invoice.php	2020-04-12 17:01:44 +02:00
atm-quentin	83f3c9ab6e	use only 1 if	2020-04-10 12:09:18 +02:00
atm-quentin	28fa0e4e5d	FIX missing selectedlines on supplier order but checkbox are displayed	2020-04-10 11:55:00 +02:00
Scrutinizer Auto-Fixer	444c293c01	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-10 08:59:32 +00:00
Laurent Destailleur	4ff503d20a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/stock/list.php htdocs/supplier_proposal/list.php	2020-04-10 02:07:51 +02:00
Laurent Destailleur	7fe8c7eab3	FIX #11855	2020-04-10 01:37:04 +02:00
Laurent Destailleur	f3d35b5a19	Fix phpcs	2020-04-02 17:06:57 +02:00
Laurent Destailleur	99ddd25ad5	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/stock/class/mouvementstock.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-04-02 16:51:50 +02:00
Laurent Destailleur	19084286be	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: ChangeLog htdocs/fourn/class/fournisseur.product.class.php	2020-04-02 16:49:37 +02:00
Laurent Destailleur	e8fa0ec50c	Merge pull request #13467 from Je2fb/develop Update card.php	2020-04-02 13:30:40 +02:00
Florian Mortgat	f52af23396	NEW: "author" column in the client/supplier invoice lists	2020-04-01 17:09:01 +02:00
Je2fb	fa32618fe9	Update card.php If rate change is modify, the currency price is taken in place of the price from the main currency	2020-03-31 18:58:59 +02:00
atm-quentin	e3dfe60567	uniformize update buyprice + some fixes	2020-03-31 14:53:15 +02:00
Laurent Destailleur	0b7b97ec34	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-03-30 19:43:03 +02:00
Laurent Destailleur	efaea37d61	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php	2020-03-30 19:42:53 +02:00
Laurent Destailleur	07d64f47e3	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-03-30 19:37:29 +02:00
Laurent Destailleur	0ec35793ee	Merge pull request #13433 from ptibogxiv/patch-315 NEW filter by product on supplier order API	2020-03-30 19:12:29 +02:00
atm-quentin	64207ef58d	FIX missing array option	2020-03-30 14:18:59 +02:00
Laurent Destailleur	4207d94f53	FIX Bad position of total in column Conflicts: htdocs/fourn/facture/paiement.php	2020-03-27 19:10:01 +01:00
Laurent Destailleur	a4797634d5	FIX Bad position of total in column	2020-03-27 19:08:39 +01:00
Laurent Destailleur	c27592bad2	Clean deprecated params on all fetch_optionals()	2020-03-27 16:02:58 +01:00
ptibogxiv	497b0e4ecc	NEW filter by product on supplier order let's get the next replenishment date and order's informations on front-end for selected products	2020-03-27 15:30:05 +01:00
Laurent Destailleur	20fad86520	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/cashcontrol/cashcontrol_card.php	2020-03-26 00:14:06 +01:00
Laurent Destailleur	51f8c5ca87	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/core/class/commoninvoice.class.php htdocs/expensereport/list.php htdocs/fourn/class/fournisseur.product.class.php htdocs/product/fournisseurs.php	2020-03-25 19:01:56 +01:00
Alexandre SPANGARO	5528e9ef38	Work on split module fournisseur	2020-03-24 22:02:58 +01:00
Laurent Destailleur	62fefab5ac	Standardize color of status	2020-03-24 19:06:37 +01:00
Laurent Destailleur	01e60562b9	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/index.php htdocs/takepos/takepos.php	2020-03-23 15:38:10 +01:00
Laurent Destailleur	ca4b641094	FIX #13407	2020-03-23 15:24:29 +01:00
Laurent Destailleur	ef86311639	Merge pull request #13224 from mapiolca/patch-38 # Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.	2020-03-22 20:32:15 +01:00
Laurent Destailleur	7145754376	Can set different warehous, lot during production	2020-03-22 17:06:59 +01:00
Laurent Destailleur	425d2afc4b	Rename js into js.php. Fix some labels	2020-03-22 12:31:27 +01:00
Laurent Destailleur	56d6c4691f	FIX #13382 Note will be concat to private note	2020-03-18 21:06:36 +01:00
Laurent Destailleur	73f2e9e5de	WIP migrate num_paiement into num_payment Fix label for free product in takepos	2020-03-16 19:23:18 +01:00
Laurent Destailleur	3b72005f93	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/card.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/cashdesk.lang htdocs/langs/fr_FR/errors.lang htdocs/langs/fr_FR/products.lang htdocs/langs/fr_FR/projects.lang	2020-03-14 00:22:11 +01:00
Laurent Destailleur	4841a5bf4a	Fix look and feel v11	2020-03-13 16:53:37 +01:00
Laurent Destailleur	c605b743e6	Fix look and feel v11	2020-03-13 16:52:00 +01:00
Laurent Destailleur	33c5db9cc3	Prepare code for the new pagination possibility	2020-03-13 13:07:11 +01:00
stickler-ci	0babab2824	Fixing style errors.	2020-03-12 11:48:08 +00:00
Scrutinizer Auto-Fixer	f413ce6aac	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-03-12 11:45:44 +00:00
simicar29	325d635c48	Load line extrafields when fetching supplier invoice PR to load extrafield values of lines when fetchinf supplier invoice.	2020-03-12 12:43:06 +01:00
Laurent Destailleur	fc05e8d768	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/bookmarks/bookmarks.lib.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/langs/en_US/other.lang	2020-03-11 18:03:15 +01:00
Laurent Destailleur	4903287204	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/core/boxes/box_commandes.php htdocs/fourn/class/fournisseur.commande.class.php	2020-03-11 17:04:28 +01:00
Laurent Destailleur	c9b715b7ad	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-03-11 17:01:31 +01:00
Laurent Destailleur	7afbb5ce9c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2020-03-11 17:00:01 +01:00
Laurent Destailleur	467dc2da7a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2020-03-11 16:59:35 +01:00
Laurent Destailleur	4bdf10c995	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2020-03-11 16:44:03 +01:00
Laurent Destailleur	c8bbaa07fd	FIX Look and feel v11	2020-03-11 15:53:08 +01:00
atm-lena	20aa51f26b	FIX - Clone Fourn Command, add line's extrafields Part 2	2020-03-11 15:26:49 +01:00
atm-lena	35f32391a0	FIX - Clone Fourn Command, add line's extrafields	2020-03-10 14:46:15 +01:00
Laurent Destailleur	0bd2740779	NEW Can force position of legend of graph on right (instead of top)	2020-03-05 17:23:19 +01:00
Laurent Destailleur	a6d340a22c	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2020-03-04 19:28:15 +01:00
Laurent Destailleur	ddc0547eda	Fix position of button	2020-03-04 13:31:19 +01:00
Laurent Destailleur	2b6aaa652d	Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency NEW: add multicurrency columns to document lists	2020-03-03 23:12:53 +01:00
Laurent Destailleur	7866f89585	Merge pull request #13260 from atm-quentin/FIX_ecm_files FIX ecm_files didnt match cause document ref contained "/"	2020-03-03 23:09:02 +01:00
atm-quentin	9446138951	FIX ecm_files didnt match cause document ref contained "/"	2020-03-03 12:07:18 +01:00
Marc de Lima Lucio	b58608dab0	NEW: supplier order list: enable multicurrency columns	2020-03-03 09:56:25 +01:00
Marc de Lima Lucio	1c912659eb	NEW: supplier invoice list: enable multicurrency columns	2020-03-03 09:38:05 +01:00
Pierre Ardoin	74ac69fc5a	Add Entity in list_product_fournisseur_price() Select too the entity value to add const NOTMODIFYOTHERENTITYFOURNPRICE	2020-02-27 09:16:15 +01:00
Laurent Destailleur	0646b1a7a9	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/ihm.php	2020-02-26 17:04:14 +01:00
Laurent Destailleur	ec108162e3	Fix GETPOST	2020-02-25 15:14:37 +01:00
Laurent Destailleur	457d0668c8	Look and feel v12	2020-02-24 05:23:34 +01:00
Scrutinizer Auto-Fixer	e44865d8b5	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-21 16:53:37 +00:00
Laurent Destailleur	55bef402c4	Fix remove a lot of warnings on Eclipse	2020-02-21 17:47:36 +01:00
Laurent Destailleur	44eda2d4ad	Fix doxygen	2020-02-20 13:42:43 +01:00
Laurent Destailleur	895503d2eb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/index.php htdocs/core/class/CMailFile.class.php	2020-02-20 00:21:25 +01:00
Laurent Destailleur	d0d352be1a	FIX #13118	2020-02-19 03:37:28 +01:00
Laurent Destailleur	2ac064059a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/admin.lang htdocs/projet/element.php	2020-02-18 22:40:43 +01:00
Laurent Destailleur	31ae0bc06e	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/fourn/commande/index.php htdocs/product/card.php	2020-02-18 22:38:30 +01:00
atm-ph	bb64d2d353	Fix create supplier invoice from supplier order don't keep source object as linked obkect	2020-02-18 16:00:12 +01:00
Regis Houssin	110a23623b	FIX an external user can not approved	2020-02-18 11:04:11 +01:00
Regis Houssin	4511cf1060	FIX missing "statut" for getNomUrl() function	2020-02-18 09:03:25 +01:00
Regis Houssin	1034e4a472	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0_mc2	2020-02-18 09:02:35 +01:00
Regis Houssin	f6f0d9d4a2	FIX better method to check user rights AND usergroup rights !	2020-02-18 08:35:51 +01:00
Regis Houssin	a5de331410	FIX Multicompany compatibility	2020-02-17 19:13:37 +01:00
Laurent Destailleur	f4f3efec62	Fight against $_POST	2020-02-16 19:33:58 +01:00
Laurent Destailleur	35ada37d4d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/comm/propal/list.php htdocs/filefunc.inc.php	2020-02-14 19:14:26 +01:00
Laurent Destailleur	bb895cb1d8	FIX ref_client not visible in tooltip.	2020-02-13 18:00:59 +01:00
Laurent Destailleur	a4f13194c3	Merge pull request #12503 from atm-greg/New_Supplier_Packaging NEW Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity	2020-02-13 10:50:56 +01:00
Laurent Destailleur	7f146111d2	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-11 19:20:46 +01:00
Laurent Destailleur	aa9ffbba05	Fix missing fields property	2020-02-11 19:18:36 +01:00
Laurent Destailleur	74d3912763	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/class/fournisseur.facture.class.php	2020-02-11 16:52:58 +01:00
AdrianDominik	5432ab3b05	FIX: #13018 Extrafields Supplier invoice	2020-02-10 11:18:59 +01:00
atm-greg	f8ffdea5ae	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging	2020-02-06 09:59:42 +01:00
Alexandre SPANGARO	d6d3fff9dc	Merge branch 'develop' into 10.0_intracommreport	2020-02-03 21:15:07 +01:00
Laurent Destailleur	4765198af2	Clean code from using deprecated field amount	2020-02-02 19:03:37 +01:00
Scrutinizer Auto-Fixer	5fda829023	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-30 00:48:28 +00:00
Laurent Destailleur	9acda3545e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-28 17:52:01 +01:00
Laurent Destailleur	c87fdc96ce	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/accountancy/supplier/index.php	2020-01-28 17:51:32 +01:00
Laurent Destailleur	80707d6a5e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-28 17:24:26 +01:00
Laurent Destailleur	3a9e238dc6	FIX Missing value of $formconfirm as parameters of hook	2020-01-28 12:00:27 +01:00
Pierre Ardoin	e0c8fce229	Fix link direction for late supplier invoices Before : $response->url_late always == $response->url After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid supplier invoices.	2020-01-27 09:39:38 +01:00
Laurent Destailleur	df478dc170	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-27 01:53:49 +01:00
Laurent Destailleur	ecaacc9543	FIX #12875	2020-01-26 23:27:47 +01:00
Laurent Destailleur	d13e5bc90b	FIX #12875	2020-01-26 23:22:47 +01:00
Laurent Destailleur	0f2141269a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-01-25 14:43:57 +01:00
Laurent Destailleur	09f809f347	FIX #12913	2020-01-25 14:03:24 +01:00
Laurent Destailleur	2d07a08e55	Fix init of specimen	2020-01-21 00:22:57 +01:00
Laurent Destailleur	80483fc085	Fix init of specimen	2020-01-21 00:20:03 +01:00
Laurent Destailleur	65fef47bdb	Enable new pdf templates as stable	2020-01-20 01:05:30 +01:00
Laurent Destailleur	6fd717539d	Merge pull request #12887 from Dolibarr/scrutinizer-patch-5 Scrutinizer Auto-Fixes	2020-01-18 20:21:29 +01:00
Laurent Destailleur	24d439845b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/stock/class/mouvementstock.class.php	2020-01-18 20:20:25 +01:00
Scrutinizer Auto-Fixer	8744f6ab7b	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-18 15:17:07 +00:00
Laurent Destailleur	0873f2fec9	Fix $user not defined	2020-01-18 16:16:17 +01:00
Laurent Destailleur	c556f60c89	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-16 18:13:35 +01:00
Laurent Destailleur	a8fd6f56ea	Look and feel v11	2020-01-16 18:12:52 +01:00
Laurent Destailleur	1d058e8707	Fix look and feel v11	2020-01-16 18:09:29 +01:00
Laurent Destailleur	ad7278e6a5	FIX Label of DEPOSIT on screen Fix look and feel v11	2020-01-16 02:48:24 +01:00
Laurent Destailleur	8973176d49	Fix class not found	2020-01-15 23:01:36 +01:00
Laurent Destailleur	2c40e4be94	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-15 20:13:45 +01:00
Laurent Destailleur	98eda68afb	Fix linkg to public notes	2020-01-15 19:49:45 +01:00
Laurent Destailleur	3f79c00542	Merge branch 'develop' into actioncomm_category	2020-01-15 14:21:06 +01:00
Laurent Destailleur	b47db086cb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/inventory/class/inventory.class.php htdocs/product/inventory/list.php	2020-01-10 14:30:42 +01:00
Frédéric FRANCE	7bea60af84	can replace formconfirm in order supplier	2020-01-10 00:27:40 +01:00
Laurent Destailleur	6dcba0f053	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-04 14:27:55 +01:00
Laurent Destailleur	38de69f5a9	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/admin/dict.php htdocs/comm/action/list.php htdocs/compta/bank/releve.php htdocs/compta/salaries/card.php htdocs/core/actions_addupdatedelete.inc.php htdocs/filefunc.inc.php htdocs/langs/en_US/boxes.lang htdocs/langs/en_US/main.lang htdocs/product/class/product.class.php htdocs/product/reassort.php htdocs/product/stock/product.php htdocs/projet/element.php	2020-01-04 14:20:25 +01:00
Pierre Tocquin	8a5f3d48f4	Update api_supplier_invoices.class.php Correction test data 'date' lors de la création d'une facture fournisseur. `array_keys` remplacé par `array_key_exists` dans la clause `if`. Cette clause est correcte dans api_invoices.class.php.	2020-01-03 19:18:24 +01:00
Laurent Destailleur	9200d7f2d7	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-01 23:02:02 +01:00
Laurent Destailleur	607d013a9d	Fix phpcs	2020-01-01 23:01:42 +01:00
Laurent Destailleur	afd32135f2	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/takepos/invoice.php	2020-01-01 22:37:13 +01:00
Laurent Destailleur	b50cb2a65d	Fix solution to solve a blocking situation (credit note both refunded and consumed)	2020-01-01 19:04:14 +01:00
Laurent Destailleur	7d07c198bc	FIX Price of purchase order and vendor invoice with multicurrency FIX entering predefined product with a forced unit price	2020-01-01 17:15:26 +01:00
Laurent Destailleur	cc8f3f7258	Fix var not defined	2020-01-01 16:41:01 +01:00
Frédéric FRANCE	90235d0528	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-31 13:57:40 +01:00
Alexandre SPANGARO	c664a1e42d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2019-12-31 08:34:37 +01:00
Laurent Destailleur	07c1a5717e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/facture_situation.php htdocs/core/class/html.formother.class.php	2019-12-23 14:16:34 +01:00
Laurent Destailleur	9a08a6bf6d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 Conflicts: htdocs/categories/traduction.php htdocs/compta/facture/class/facture.class.php htdocs/contact/card.php htdocs/core/modules/modSociete.class.php htdocs/fourn/class/fournisseur.product.class.php htdocs/langs/en_US/products.lang htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php htdocs/margin/productMargins.php htdocs/margin/tabs/productMargins.php htdocs/margin/tabs/thirdpartyMargins.php	2019-12-23 14:13:26 +01:00
Laurent Destailleur	4d12ecb072	FIX #12745	2019-12-23 13:40:35 +01:00
Laurent Destailleur	ad039ff968	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/repair.php	2019-12-21 14:03:45 +01:00
Laurent Destailleur	8059463941	Debug v11	2019-12-20 17:54:54 +01:00
Laurent Destailleur	2ad483413e	Better place to force the default warehouse	2019-12-19 12:05:34 +01:00
stickler-ci	2f41a53bb4	Fixing style errors.	2019-12-19 10:38:19 +00:00
Laurent Destailleur	0f30e6f73b	Update dispatch.php	2019-12-19 11:35:50 +01:00
Laurent Destailleur	a71f0e3472	Merge branch 'develop' into fourn	2019-12-19 11:35:02 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Laurent Destailleur	af4288ff3f	FIX #12728	2019-12-17 13:56:32 +01:00
Laurent Destailleur	3207add2a6	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formfile.class.php htdocs/fourn/class/fournisseur.product.class.php	2019-12-17 12:52:12 +01:00
Laurent Destailleur	60a0c18338	Merge pull request #12708 from atm-gauthier/10.0_fix_product_fourn_price_id FIX : product_fourn_price_id was assigned too late for logPrice() function	2019-12-14 22:28:11 +01:00
Laurent Destailleur	2c4fd099c8	Update fournisseur.product.class.php	2019-12-14 22:27:45 +01:00
Laurent Destailleur	e9a0646f6f	Update fournisseur.product.class.php	2019-12-14 22:25:34 +01:00
Laurent Destailleur	838633d0de	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/system/filecheck.php htdocs/api/class/api_setup.class.php htdocs/compta/facture/card.php htdocs/compta/stats/index.php htdocs/core/actions_massactions.inc.php htdocs/install/upgrade2.php htdocs/loan/card.php htdocs/loan/document.php htdocs/loan/info.php htdocs/loan/note.php htdocs/loan/schedule.php htdocs/product/list.php htdocs/ticket/card.php htdocs/user/class/user.class.php	2019-12-14 14:53:49 +01:00
gauthier	cc1454c8d5	FIX : product_fourn_price_id was assigned too late for logPrice() function	2019-12-13 14:55:39 +01:00
Frédéric FRANCE	57055bad03	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-13 14:36:00 +01:00
Frédéric FRANCE	2136499c67	The variable $query seems to be never defined	2019-12-12 20:11:18 +01:00
gauthier	a0aa51fe0c	FIX : CommandeFournisseurLigne update function must not be able to return other value than 1 if success	2019-12-12 16:46:25 +01:00
Frédéric FRANCE	e078bc6f83	doxygen	2019-12-10 08:08:56 +01:00
Frédéric FRANCE	4c5c6b6ff1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-03 17:56:43 +01:00
Laurent Destailleur	6f7343b14f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-12-02 11:01:26 +01:00
Laurent Destailleur	6d81bc77cb	Fix look and feel v11	2019-12-02 11:00:09 +01:00
Laurent Destailleur	92070fa491	Fix name of variable $trigger_name into $triggersendname	2019-12-02 09:38:16 +01:00
Frédéric FRANCE	b2912e688b	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-27 22:54:05 +01:00
Frédéric FRANCE	b104133f7a	Update orderstoinvoice.php	2019-11-26 18:29:52 +01:00
Frédéric FRANCE	4c4ae5b6e1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-26 08:10:40 +01:00
stickler-ci	5d051cc901	Fixing style errors.	2019-11-25 07:08:22 +00:00
atm-greg	5af9784dc9	fix update line	2019-11-25 07:40:29 +01:00
Laurent Destailleur	bc5270ce76	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/facture/card.php	2019-11-24 18:15:25 +01:00
Laurent Destailleur	c7aaed1264	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/fourn/facture/card.php	2019-11-24 18:14:18 +01:00
Laurent Destailleur	8656143050	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-11-24 18:13:02 +01:00
Laurent Destailleur	98a7a5559f	Fix bad fix	2019-11-24 18:12:40 +01:00
Laurent Destailleur	f2e01834a5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-11-24 18:11:46 +01:00
Laurent Destailleur	27e4c66dd5	Fix empty	2019-11-24 18:11:11 +01:00
atm-greg	89dd04aa07	implement on supplier_order	2019-11-23 19:05:49 +01:00
atm-greg	ce15af0980	manage packaging on supplier prices	2019-11-23 15:52:34 +01:00
Laurent Destailleur	e4d9f99484	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/remx.php htdocs/expedition/card.php htdocs/fourn/facture/card.php	2019-11-22 15:04:40 +01:00
Laurent Destailleur	186a13f101	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/fourn/facture/card.php	2019-11-22 14:51:13 +01:00
Laurent Destailleur	ece35538f0	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-11-22 14:49:29 +01:00
Laurent Destailleur	4043356f3a	Update card.php	2019-11-22 14:25:32 +01:00
gauthier	a8d02615a8	FIX : we need to be able to recalculate tva only if invoice not ventil	2019-11-21 14:58:20 +01:00
Frédéric FRANCE	d182eee4bf	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-19 23:26:00 +01:00
Laurent Destailleur	fb70893229	Fix missing class reposition	2019-11-19 21:29:49 +01:00
Frédéric FRANCE	2e5f539b2a	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-18 17:45:52 +01:00
Laurent Destailleur	2689f7515c	Fix pb with colspan and extrafields. Fix remove empty id	2019-11-16 14:38:05 +01:00
Frédéric FRANCE	6784ea9fae	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-16 09:21:57 +01:00
Laurent Destailleur	1f5bea01f5	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/fourn/class/fournisseur.product.class.php htdocs/product/fournisseurs.php htdocs/user/card.php	2019-11-14 21:30:16 +01:00
Laurent Destailleur	7e52c70321	FIX Advisory ID: usd20190067	2019-11-14 21:16:18 +01:00
Scrutinizer Auto-Fixer	ddcc14dc16	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-14 11:09:15 +00:00
Frédéric FRANCE	a3e092b227	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-14 09:21:26 +01:00
Laurent Destailleur	171b94fc5c	Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 Scrutinizer Auto-Fixes	2019-11-14 08:50:24 +01:00
Laurent Destailleur	86094613e8	Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 Scrutinizer Auto-Fixes	2019-11-14 08:50:06 +01:00
Frédéric FRANCE	446c66da62	use class CONST	2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer	b40ecc3933	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer	ac40dd8bbe	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer	8a527631a0	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer	c85e54b08c	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer	df664e790b	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-11 23:15:34 +00:00
Laurent Destailleur	b4d40da768	Clean params	2019-11-11 13:32:36 +01:00
Laurent Destailleur	28b10e4610	Merge pull request #12379 from altatof/dispatch_force_qty_input NEW : add constant DISPATCH_FORCE_QTY_INPUT	2019-11-08 11:38:57 +01:00
Laurent Destailleur	52e90a8d91	Update dispatch.php	2019-11-08 11:38:08 +01:00
Scrutinizer Auto-Fixer	2ecfe41810	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-08 09:53:31 +00:00
altairis	c574f5990f	add constant DISPATCH_FORCE_QTY_INPUT	2019-11-07 14:31:30 +01:00
Laurent Destailleur	f84087ba70	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-07 14:08:01 +01:00
Laurent Destailleur	1fa61077a0	FIX #12356	2019-11-07 14:07:50 +01:00
Frédéric FRANCE	001010d5e3	fix phpcs	2019-11-07 12:43:33 +01:00
Laurent Destailleur	af2df62aaa	Merge branch 'develop' into patch-7	2019-11-07 11:23:17 +01:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
Frédéric FRANCE	d2e59fc2af	css	2019-11-05 21:14:22 +01:00
Laurent Destailleur	94bd0f71d9	Fix pb with permission	2019-11-05 19:41:30 +01:00
Laurent Destailleur	9e9d88f28c	Fix stats on tickets	2019-11-05 16:06:08 +01:00
Laurent Destailleur	7ab19ef66b	Fix selection not lose if creation of vendor invoice fails	2019-11-05 13:34:25 +01:00
Laurent Destailleur	ce1dec253f	FIX #11364	2019-11-05 12:47:38 +01:00
Laurent Destailleur	1aef1c60dd	Merge pull request #11867 from frederic34/socialnetworks NEW add socialnetworks dictionary	2019-11-04 21:10:22 +01:00
Laurent Destailleur	ec8bd6327d	Fix css	2019-11-04 18:53:46 +01:00
Laurent Destailleur	11500fb8d9	FIX confusion between permto... and permisstionto...	2019-11-04 15:33:49 +01:00
Frédéric FRANCE	872f58f261	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-11-03 21:48:24 +01:00
Laurent Destailleur	630a150b09	Fix multicurrency rate must be visible if currency differs only	2019-11-03 17:48:16 +01:00
Laurent Destailleur	ab7c300f43	NEW Can change supplier when cloning a Purchase Order	2019-11-02 20:50:25 +01:00
Laurent Destailleur	e087ac434d	Merge pull request #12283 from frederic34/socid replace deprecated user->societe_id by user->socid	2019-11-02 13:34:21 +01:00
Laurent Destailleur	58ffb73627	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-02 12:59:49 +01:00
Laurent Destailleur	45c77b4560	Renaming some libelle into label	2019-11-02 12:59:38 +01:00
Laurent Destailleur	25e64b0610	Merge branch 'develop' into socid	2019-11-02 12:01:06 +01:00
Laurent Destailleur	68691ddd8a	Merge pull request #12265 from grandoc/new_branch_30_10_2019 add comment	2019-11-02 11:49:28 +01:00
Laurent Destailleur	7e6732c11b	Merge pull request #12263 from defrance/patch-144 fix: delete function optional and id value	2019-11-02 11:49:04 +01:00
Laurent Destailleur	68c971a2b5	All properties 'type_libelle' were renamed into 'type_label'.	2019-11-02 11:12:57 +01:00
Frédéric FRANCE	77d4ca81dc	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-02 09:14:15 +01:00
Scrutinizer Auto-Fixer	50f55cac35	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-02 00:17:45 +00:00
Laurent Destailleur	cea2c3a9f4	Look and feel v11	2019-11-01 23:58:14 +01:00
Frédéric FRANCE	dbed10a701	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-01 21:39:20 +01:00
Laurent Destailleur	a1700e71be	Fix phpcs	2019-10-31 21:18:38 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Frédéric FRANCE	f7747ed00a	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-30 20:06:43 +01:00
Philippe GRAND	ccb957623c	add some comment	2019-10-30 10:00:52 +01:00
Laurent Destailleur	6769efc372	Merge pull request #12234 from frederic34/patch-17 Update list.php	2019-10-30 03:00:03 +01:00
Laurent Destailleur	66a288a343	Merge pull request #12235 from frederic34/scopeindent clean indent	2019-10-30 02:57:59 +01:00
Laurent Destailleur	7e4ceeb08a	Merge pull request #12244 from TobiasSekan/FixInvoiceSupplierCountArray Fix count array for invoice supplier	2019-10-30 02:51:06 +01:00
BENKE Charlene	1b7e138e01	fix: delete function optional and id value	2019-10-29 17:27:30 +01:00
Tobias Sekan	ed813b872f	Fix count array for invoice supplier	2019-10-28 10:40:07 +01:00
Frédéric FRANCE	b2b057e9b5	clean indent	2019-10-27 09:51:15 +01:00
Frédéric FRANCE	d6045cdb78	Update list.php	2019-10-26 13:28:06 +02:00
Frédéric FRANCE	a43e6f96b5	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-25 08:12:54 +02:00
Laurent Destailleur	2201b11fd3	NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL	2019-10-24 13:41:04 +02:00
Laurent Destailleur	b88968520b	Move code of extrafields to the new architecture	2019-10-22 17:08:37 +02:00
Frédéric FRANCE	f4540dddb8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-17 20:24:04 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Laurent Destailleur	8da0cd4a35	Merge branch 'develop' into patch-13	2019-10-16 13:32:31 +02:00
Laurent Destailleur	e07e01580d	Replace deprecated code with new one	2019-10-16 03:34:32 +02:00
Frédéric FRANCE	d1d9b1ed85	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-15 09:39:57 +02:00
Laurent Destailleur	fb3d20107c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/exports/export.php htdocs/filefunc.inc.php	2019-10-15 03:51:57 +02:00
Laurent Destailleur	65b6bc26ba	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/facture/list.php	2019-10-14 23:54:24 +02:00
Laurent Destailleur	ee5fdc3239	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-10-14 23:52:58 +02:00
Laurent Destailleur	0fe3159a8a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/fourn/facture/list.php	2019-10-14 23:52:46 +02:00
Frédéric FRANCE	b88059433c	Update list.php	2019-10-14 21:36:38 +02:00
Frédéric FRANCE	45b3d623bb	Update list.php	2019-10-14 20:30:31 +02:00
JC Prieto	d109341ebe	Update card.php Variable $mesg not do anything	2019-10-11 18:08:15 +02:00
Frédéric FRANCE	367ef4acaf	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-11 16:44:25 +02:00
Frédéric FRANCE	03bbfc6ad9	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-10 23:24:50 +02:00
Frédéric FRANCE	43c7917108	Update fournisseur.commande.class.php	2019-10-09 23:59:12 +02:00
Laurent Destailleur	072a0a26d6	Use a font awesome icon to show "shippable" flag on orders.	2019-10-09 18:07:00 +02:00
Frédéric FRANCE	f253315c8d	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 18:30:58 +02:00
Laurent Destailleur	94905ebbec	css	2019-10-08 11:56:38 +02:00
Laurent Destailleur	43a70e5548	Clean code to use the new $extrafields->attributes array	2019-10-08 09:28:50 +02:00
Frédéric FRANCE	b78187c1eb	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 00:07:27 +02:00
Laurent Destailleur	f56da782ab	Merge pull request #12038 from Ahuahuachi/develop NEW Add hidden options to send by email even for draft status	2019-10-07 14:18:53 +02:00
Laurent Destailleur	1060ac4608	Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus Fix : LibStatut missing dolgetstatus usage	2019-10-07 13:08:33 +02:00
Frédéric FRANCE	ec8569dd85	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-06 15:56:21 +02:00
Laurent Destailleur	866dcf18fe	Look and feel v11	2019-10-06 15:34:22 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
Frédéric FRANCE	6384e7eb67	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-05 20:02:16 +02:00
Laurent Destailleur	b883a8092a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php htdocs/core/lib/product.lib.php htdocs/core/tpl/extrafields_list_search_input.tpl.php htdocs/fourn/facture/card.php htdocs/product/class/html.formproduct.class.php	2019-10-05 19:35:40 +02:00
altairis	8b8a5e315a	fix test error	2019-10-04 10:55:09 +02:00
altairis	55c0913884	Merge branch 'develop' into fourn	2019-10-04 10:51:28 +02:00
Laurent Destailleur	0b9d27423d	FIX Can't modify vendor invoice if transfered into accountancy	2019-10-04 10:31:57 +02:00
Alfredo Altamirano	140784d741	Merge remote-tracking branch 'Dolibarr/develop' into develop	2019-10-03 20:32:26 -05:00
Alfredo Altamirano	b6882af1b6	Add hidden options to send by email for all status	2019-10-03 20:21:13 -05:00
ATM john	35c6008e1a	Fix supplier order libStatus to use new dolGetStatus	2019-10-03 21:58:23 +02:00
Laurent Destailleur	1a66e0b05e	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/product/card.php	2019-10-03 17:53:59 +02:00
Laurent Destailleur	75be637b0b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-10-03 17:50:57 +02:00
Frédéric FRANCE	e443538f71	wip	2019-10-03 17:23:50 +02:00
atm-lena	ae01bd8f07	FIX missing begin()	2019-10-03 17:23:16 +02:00
Laurent Destailleur	24570f7165	Look and feel v11. Picto are fontawesome.	2019-10-02 18:14:41 +02:00
Laurent Destailleur	ce090d43a0	Close #8907	2019-10-01 15:01:29 +02:00
Alexandre SPANGARO	16c6c9ae75	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Laurent Destailleur	b28cd1bb57	Merge pull request #11972 from aspangaro/11.0_fa_icon NEW Add fa_icon on load_fiche_titre	2019-09-30 15:26:28 +02:00
Alexandre SPANGARO	aec50d3ac9	NEW Add fa_icon on load_fiche_titre	2019-09-30 10:14:55 +02:00
Laurent Destailleur	6966651d51	Standardize code to use dolSqlDateFilter	2019-09-28 13:22:05 +02:00
Laurent Destailleur	c0e7c558a1	Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception NEW widget box for supplier orders awaiting reception	2019-09-27 15:32:43 +02:00
Laurent Destailleur	f5c839217a	Merge pull request #11914 from fmarcet/develop Fix: Load invoices only if showed	2019-09-27 14:34:16 +02:00
Laurent Destailleur	72ea1a2867	Merge pull request #11927 from OPEN-DSI/fix-fournisseur-product-display-histo-tooltip FIX dol_print_date format in buying price tooltip	2019-09-27 12:25:26 +02:00
Laurent Destailleur	961f2b5165	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/categories/viewcat.php htdocs/fourn/class/fournisseur.product.class.php htdocs/takepos/invoice.php	2019-09-24 14:25:02 +02:00
Laurent Destailleur	5838fa1229	Fix az09 -> aZ09	2019-09-24 14:20:45 +02:00
Laurent Destailleur	6431e8e16d	FIX SQL injection on qty	2019-09-24 12:43:44 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
VESSILLER	cf7193691f	FIX dol_print_date format in buying price tooltip	2019-09-18 11:22:32 +02:00
Ferran Marcet	81d8055a9c	New: Load invoices only if showed	2019-09-17 09:43:15 +02:00
Laurent Destailleur	80f498f206	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-14 19:25:52 +02:00
Laurent Destailleur	bbb62f27c7	Update doc	2019-09-14 19:25:09 +02:00
Laurent Destailleur	9f6fe0bf5a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/orders.lang	2019-09-14 18:27:58 +02:00
Laurent Destailleur	3caa1bd43c	FIX Debug feature orderstoinvoice for suppliers	2019-09-14 18:21:37 +02:00
Laurent Destailleur	844f0903da	Fix missing fields	2019-09-14 17:34:57 +02:00
ATM john	337194023a	Add purchase orders awaiting reception to workboard	2019-09-10 22:10:20 +02:00
Laurent Destailleur	1d74387125	Removed deprecated property ->numero (We must use ->num_payment)	2019-09-09 08:47:23 +02:00
Laurent Destailleur	30d2f84eb7	Remove a label that is no more used	2019-09-07 10:58:20 +02:00
Laurent Destailleur	a481fac289	Merge pull request #11793 from altatof/supplierorderstatus Differentiate supplier orders status	2019-09-07 10:54:03 +02:00
Laurent Destailleur	09d6826e62	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/supplier_order.php htdocs/langs/en_US/admin.lang	2019-09-06 14:27:01 +02:00
Laurent Destailleur	529dd05226	Replace deprecated code	2019-09-06 10:53:05 +02:00
Laurent Destailleur	16484e1fa3	Fix balance of td	2019-09-06 02:22:44 +02:00
Laurent Destailleur	80daf29d79	Fix conflict between new module reception and old process Fix inventory record does not need status at creation Conflicts: htdocs/fourn/commande/card.php	2019-09-06 01:55:22 +02:00
Laurent Destailleur	04adbd8c80	Fix conflict between new module reception and old process Fix inventory record does not need status at creation	2019-09-06 01:52:51 +02:00
Laurent Destailleur	92e7d7bb26	Fix duplicate translation	2019-09-05 16:18:20 +02:00
Christophe Battarel	754897604f	merge develop	2019-09-05 15:47:58 +02:00
Christophe Battarel	0bf70dddc7	actualize from develop	2019-09-05 15:33:16 +02:00
Christophe Battarel	dff36c9d68	actualize from develop	2019-09-05 15:30:14 +02:00
Laurent Destailleur	f7ce723686	Merge pull request #11800 from jtraulle/fix-11427-10.0 FIX #11427 require product class (fixes POST /supplierinvoices REST API endpoint)	2019-09-03 12:56:00 +02:00
Laurent Destailleur	98459363df	Merge pull request #11795 from jtraulle/fix-doxygen-examples Fix Wrongly catched examples by Doxygen	2019-09-03 12:45:23 +02:00
Laurent Destailleur	a269082d70	Replace deprecated code with new one	2019-09-02 03:58:00 +02:00
Jean Traullé	237c29d428	FIX #11427 require product class Fixes POST /supplierinvoices REST API endpoint	2019-08-31 00:07:14 +02:00
Jean Traullé	c32c7d48ba	Fix Wrongly catched examples by Doxygen	2019-08-30 17:14:59 +02:00
Christophe Battarel	8c8844d7ae	Differentiate supplier orders status	2019-08-30 09:33:01 +02:00
Laurent Destailleur	999db7ed41	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/salaries/card.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/takepos/invoice.php	2019-08-26 16:49:25 +02:00
Laurent Destailleur	c93e6550ce	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/compta/paiement.php htdocs/compta/sociales/class/chargesociales.class.php	2019-08-26 16:43:24 +02:00
Laurent Destailleur	dcfbba9af5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/compta/sociales/class/chargesociales.class.php	2019-08-26 16:41:06 +02:00
Laurent Destailleur	b7e7ca46b5	Fix responsive	2019-08-23 14:01:13 +02:00
Christophe Battarel	7c3e643fca	fix PSR2 missing space	2019-08-22 16:07:18 +02:00
Laurent Destailleur	3f105a97bf	Debug the new workboard	2019-08-18 04:56:48 +02:00
Laurent Destailleur	5351d78a96	Merge branch 'develop' into develop_new_dashboard	2019-08-18 01:26:56 +02:00
Laurent Destailleur	b8406f842d	Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list Fix total on list and amount opened on thirdparty card (for supplier)	2019-08-15 21:14:03 +02:00
Laurent Destailleur	7035bf88ca	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-15 19:52:01 +02:00
Laurent Destailleur	f1a63fd51b	Merge pull request #11684 from jtraulle/fix-rest-api-supplierinvoices-post-with-lines-fk_product FIX #11427 require product class (fixes POST /supplierinvoices REST API endpoint)	2019-08-15 19:51:12 +02:00
Laurent Destailleur	f26a13ff13	NEW Removed deprecated code that create linked object from ->origin	2019-08-15 19:50:18 +02:00
Jean Traullé	c739b95666	Fix codestyle lessc.class.php should be excluded from ruleset as it is an external lib	2019-08-14 23:33:06 +02:00
Jean Traullé	003642fe10	Preserve spaces instead of tabs for indentation.	2019-08-14 23:07:18 +02:00
Jean Traullé	1d2c2f8551	NEW Add payments GET and POST REST API endpoints for supplierinvoices.	2019-08-14 23:00:40 +02:00
Jean Traullé	b90815b972	FIX require product class (fixes POST /supplierinvoices REST API endpoint) When passing a fk_product field into a supplier invoice line on the POST /supplierinvoices REST API endpoint, we need to require the product class first in fournisseur.facture.class.php to be able to load the Product from the passed id.	2019-08-13 16:36:41 +02:00
John Botella	b4c4e5a662	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard	2019-08-02 14:52:01 +02:00
Laurent Destailleur	d7a41c6b72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/admin.lang	2019-08-01 12:54:27 +02:00
John Botella	9b84987cc1	prepare new dashboard	2019-08-01 12:33:19 +02:00
Laurent Destailleur	5eb8f05061	FIX #11584	2019-08-01 12:23:02 +02:00
Laurent Destailleur	9a60fac9d1	Merge pull request #11564 from simnandez/develop NEW: Add hidden option for update supplier buying in receptions	2019-07-30 21:43:03 +02:00
Laurent Destailleur	aba9eafeea	Update dispatch.php	2019-07-30 21:42:53 +02:00
Laurent Destailleur	11e3aa5860	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-29 11:07:11 +02:00
Laurent Destailleur	7931f0b422	Fix sql error	2019-07-29 11:06:39 +02:00
Laurent Destailleur	a5e3adc6f1	Fix travis	2019-07-29 10:51:17 +02:00
Laurent Destailleur	db461792a0	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-29 01:36:35 +02:00
Laurent Destailleur	9a7113f4f5	FIX Update the file index table when we validate/rename a ref.	2019-07-28 22:26:55 +02:00
Laurent Destailleur	9f7d118f6f	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-27 02:40:56 +02:00
Laurent Destailleur	2867e31a63	Fix CSS	2019-07-27 01:13:39 +02:00
Juanjo Menent	38bb046abb	NEW: Add hidden option SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT for add possibility to update supplier buying price in the reception on a supplier order	2019-07-26 12:38:49 +02:00
Alexandre SPANGARO	2c74caff90	WIP	2019-07-22 06:56:55 +02:00
Laurent Destailleur	50480bf517	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/opensurvey/index.php	2019-07-18 18:23:24 +02:00
Laurent Destailleur	3cffd70ed3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/prelevement/create.php htdocs/core/class/commonobject.class.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/commande/dispatch.php htdocs/fourn/product/list.php htdocs/opensurvey/index.php htdocs/ticket/index.php htdocs/ticket/list.php	2019-07-18 18:09:37 +02:00
Laurent Destailleur	5e204f0f67	Merge	2019-07-18 17:51:32 +02:00
Laurent Destailleur	b044d95acf	Merge	2019-07-18 17:50:15 +02:00
Laurent Destailleur	f53f314211	Update fournisseur.product.class.php	2019-07-18 17:15:50 +02:00
Christophe Battarel	5daf0316f9	also fix bad insert sql command	2019-07-18 11:18:25 +02:00
Christophe Battarel	32bc8a5faf	FIX fournrprice log for insert	2019-07-18 11:05:51 +02:00
gauthier	c72a59ad36	FIX : we need to be able to add freeline with qty between 0 & 1 in supplierorder line	2019-07-16 14:55:19 +02:00
atm-florian.m	8aa147a4e5	# missing hooks from dispatch.php and list.php	2019-07-15 11:59:22 +02:00
atm-florian.m	ae540cb25e	FIX: add missing hook calls	2019-07-15 11:59:22 +02:00
Laurent Destailleur	f5cc29417d	Translation lignes -> lines	2019-07-05 21:50:35 +02:00
Laurent Destailleur	0a7d70829f	Translation of some comments	2019-07-05 21:37:25 +02:00
Laurent Destailleur	d3b4a91f41	NEW Can enter price tax incl on vendor proposal and purchase orders	2019-07-05 20:24:22 +02:00
Laurent Destailleur	bbb5b43e94	Fix duplicate trans	2019-07-05 19:03:16 +02:00
Laurent Destailleur	ee109ac568	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-05 17:44:50 +02:00
Laurent Destailleur	ed39849d33	Fix css	2019-07-04 16:14:10 +02:00
Laurent Destailleur	4e00cfb455	Clean code	2019-07-04 16:02:04 +02:00
Laurent Destailleur	d405a58999	Merge pull request #11424 from OPEN-DSI/issue-fourn-commande-card-makeorder NEW The order method in purchase order is now mandatory when registering the order	2019-07-04 15:52:51 +02:00
Laurent Destailleur	1de499a320	Update card.php	2019-07-04 15:52:03 +02:00
Laurent Destailleur	9405ce335e	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-04 15:43:43 +02:00
Laurent Destailleur	657a3ae4c5	FIX permission to delete a draft purchase order	2019-07-04 12:43:32 +02:00
Laurent Destailleur	2fee41f712	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-04 12:27:00 +02:00
Laurent Destailleur	69e0353e12	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-07-04 12:26:26 +02:00
Laurent Destailleur	8e3620fce1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/compta/facture/invoicetemplate_list.php	2019-07-04 12:26:17 +02:00
Laurent Destailleur	ee0a65e7fa	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/comm/action/card.php	2019-07-04 12:22:40 +02:00
atm-florian.m	3e53a06b2e	minor spelling issues	2019-07-03 16:17:47 +02:00
Alexandre SPANGARO	ab7cb7bb2e	FIX Nowrap on amount	2019-07-02 12:01:50 +02:00
Laurent Destailleur	adb3062a9f	Work on nblignes -> nblines	2019-06-29 16:38:14 +02:00
VESSILLER	f4978e9473	FIX/NEW - Force mandatory order method	2019-06-28 10:58:31 +02:00
VESSILLER	e6ee1e7041	FIX Force order method in order supplier before making order	2019-06-27 14:21:38 +02:00
Laurent Destailleur	51a1550dbb	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog	2019-06-25 23:14:49 +02:00
Laurent Destailleur	a2d50eb95a	Fix sql regression	2019-06-25 18:12:12 +02:00
Laurent Destailleur	0c3f524319	Clean code	2019-06-25 16:12:16 +02:00
Laurent Destailleur	f6719db4f3	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-25 16:09:08 +02:00
Laurent Destailleur	a98ceb584d	Fix syntax error	2019-06-25 16:08:01 +02:00
Laurent Destailleur	fa476b4994	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +02:00
Laurent Destailleur	1c924ef17e	Fix bad label on supplier invoice	2019-06-25 12:54:02 +02:00
Laurent Destailleur	8cc6c18931	Fix bad label on supplier invoice	2019-06-25 12:53:23 +02:00
Laurent Destailleur	3c6d271c67	Removed deprecated fields	2019-06-25 12:42:36 +02:00
Laurent Destailleur	a7bd734ece	Rename ->produit into ->product. Still permissions to rename.	2019-06-24 21:18:49 +02:00
Laurent Destailleur	4f9aa4caac	Fix phpcs	2019-06-20 13:53:31 +02:00
Laurent Destailleur	e9da44e023	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-20 12:33:02 +02:00
Laurent Destailleur	1a6dc83d4c	Fix: default accounting account for eec and export sales were not used.	2019-06-20 12:25:58 +02:00
Laurent Destailleur	a264a4766a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-20 03:45:04 +02:00
Laurent Destailleur	078324811b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/core/lib/functions2.lib.php htdocs/fourn/class/fournisseur.facture.class.php	2019-06-20 03:43:16 +02:00
Laurent Destailleur	4574ad2eeb	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/actions_massactions.inc.php	2019-06-20 03:39:48 +02:00
Laurent Destailleur	2372d32436	Merge pull request #11319 from atm-maxime/new_suppinvoice_list_massfilearea New : add file area at bottom of supplier invoices list	2019-06-20 03:12:45 +02:00
Laurent Destailleur	53688e2d0f	Merge pull request #11353 from fmarcet/8.0 FIX: Wrong stock movement on supplier credit notes	2019-06-20 03:11:28 +02:00
Laurent Destailleur	4308f48cad	Merge branch 'develop' into MissingHook	2019-06-20 03:04:32 +02:00
Laurent Destailleur	a11c816a17	Fix tooltip	2019-06-19 14:24:48 +02:00
gauthier	3ad13adf31	FIX : better syntax	2019-06-19 10:43:42 +02:00
gauthier	7331e43db8	FIX : we need to fetch fourn invoice with ref in current entity	2019-06-19 10:19:33 +02:00
Nicolas ZABOURI	2e4db8c83c	Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook	2019-06-19 08:39:05 +02:00
ICstage	820c420ae5	FIX Missing hooks	2019-06-18 14:07:52 +02:00
Laurent Destailleur	08d5ca4ddb	Debug page to export accounting documents	2019-06-17 17:53:43 +02:00
Ferran Marcet	c62f370959	FIX: Wrong stock movement on supplier credit notes	2019-06-17 16:30:56 +02:00
Laurent Destailleur	dac99c878c	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/projet/tasks/time.php	2019-06-17 15:57:06 +02:00
Juanjo Menent	8afffc8762	FIX: #11335	2019-06-14 18:28:01 +02:00
Laurent Destailleur	ff1adb3934	Fix dead code	2019-06-13 22:11:25 +02:00
Laurent Destailleur	52159dcb69	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/core/class/html.formother.class.php	2019-06-13 12:14:19 +02:00
Laurent Destailleur	4b1f0d1ac2	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/html.formother.class.php	2019-06-13 12:11:31 +02:00
Francis Appels	a26c868783	Fix scrutinizer bugs	2019-06-12 22:05:10 +02:00
atm-greg	47746fd17d	fix template type	2019-06-12 12:30:49 +02:00
Maxime Kohlhaas	2044847552	New : add file area at bottom of supplier invoices list	2019-06-10 22:33:11 +02:00
Laurent Destailleur	49646663a1	Fix link on invoice	2019-06-07 22:47:15 +02:00
Laurent Destailleur	21a1e0d7b3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/categories/index.php htdocs/comm/action/list.php htdocs/comm/action/rapport/index.php htdocs/compta/paiement.php htdocs/compta/sociales/document.php htdocs/compta/tva/document.php htdocs/core/actions_massactions.inc.php htdocs/core/class/commonobject.class.php htdocs/fourn/facture/paiement.php htdocs/loan/document.php htdocs/main.inc.php	2019-06-04 19:03:27 +02:00
Laurent Destailleur	57cfb4b007	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/website/class/website.class.php	2019-06-02 12:36:07 +02:00
Maxime Kohlhaas	6dd01e86e9	Fix : avoid warning and uniformize var use	2019-05-31 15:53:23 +02:00
Laurent Destailleur	2218994958	FIX Duplicate encoding on error message	2019-05-29 09:51:45 +02:00
Laurent Destailleur	22e897b1a1	Clean and prepare code to fix a SQL injection	2019-05-21 17:22:38 +02:00
Laurent Destailleur	5f23cf7e2a	CSS	2019-05-19 13:51:47 +02:00
Laurent Destailleur	11fea03074	Merge pull request #11026 from atm-john/new_look_and_feel_title_button NEW : look and feel title button	2019-05-18 16:04:47 +02:00
Laurent Destailleur	c1ec7454a1	Merge branch 'develop' into clean_10_beta	2019-05-16 21:21:51 +02:00
Laurent Destailleur	9f8f45d5bc	FIX Payment on supplier invoice should not mix credit note and standard invoices.	2019-05-14 12:00:58 +02:00
Francis Appels	a2d4a59321	Merge branch 'develop' into clean_10_beta	2019-05-13 21:27:13 +02:00
Juanjo Menent	80ef97e215	FIX: #11025	2019-05-11 16:41:01 +02:00
Juanjo Menent	81bf7d07e3	Merge remote-tracking branch 'upstream/7.0' into 7.0	2019-05-11 16:32:02 +02:00
Laurent Destailleur	3def11d5c9	Standardize translation	2019-05-10 19:32:46 +02:00
Laurent Destailleur	a1f0df9a30	Debug receipt module	2019-05-09 17:45:16 +02:00
Laurent Destailleur	1c558c685c	Fix class not found	2019-05-09 17:16:35 +02:00
Rüdiger Hahn	acb2f59f56	Fetch db value for cond_reglement_doc/cond_reglement_libelle_doc cond_reglement and cond_reglement_doc got the same value cond_reglement_libelle. It looks like that the db field libelle_facture was intended to be used for cond_reglement_libelle_doc.	2019-05-06 19:22:49 +02:00
Francis Appels	03e2983d40	Merge branch 'develop' into clean_10_beta	2019-05-06 15:22:27 +02:00
Laurent Destailleur	9115df7439	Debug v10	2019-05-03 11:25:53 +02:00
Christophe Battarel	ed12b1855c	change entrepot to warehouse	2019-05-01 13:55:27 +02:00
Christophe Battarel	9999ae05cc	add default warehouse	2019-05-01 11:10:11 +02:00
Francis Appels	18c5c586ab	Cleanup set_draft in syslog	2019-05-01 09:38:27 +02:00
Laurent Destailleur	3007905508	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formmail.class.php htdocs/core/modules/modProduct.class.php htdocs/core/modules/modService.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/stripe/class/stripe.class.php	2019-04-30 03:30:40 +02:00
Laurent Destailleur	627ef14454	FIX The autocopy feature was ko for suppliers	2019-04-29 18:51:15 +02:00
Lionel VESSILLER	e80436469f	Fix default payment condition and method	2019-04-25 16:05:12 +02:00
Laurent Destailleur	091132de2f	Signatures of methods createFromClone() has been standardized. All methods requires the object User as first parameter.	2019-04-25 12:11:32 +02:00
Laurent Destailleur	68d438b697	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/card.php htdocs/user/class/user.class.php	2019-04-25 01:50:48 +02:00
Laurent Destailleur	a15f1350be	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-04-25 01:39:02 +02:00
Laurent Destailleur	07caf22647	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-04-25 01:37:25 +02:00
atm-greg	70017da95a	testing if customer invoice module is activated doesn't make sense on supplier commande card...	2019-04-24 14:59:54 +02:00
Laurent Destailleur	691159c56b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-04-24 10:24:55 +02:00
Laurent Destailleur	1264857211	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/js/timesheet.js	2019-04-24 10:24:32 +02:00
atm-greg	6e425d1895	add origin of line in fourn orderstoinvoice.php	2019-04-24 08:56:06 +02:00
Laurent Destailleur	e6ffaeefe5	CSS	2019-04-17 10:39:30 +02:00
Christophe Battarel	30ad0e7e11	introduce PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY	2019-04-16 09:00:39 +02:00
John BOTELLA	7372e8c610	Appli function to links	2019-04-15 15:47:36 +02:00
ATM john	292d9c38a5	Appli function to links	2019-04-15 00:21:58 +02:00
Juanjo Menent	1b5cabad71	Fix: #10956	2019-04-12 18:50:48 +02:00
Laurent Destailleur	cf058e7d3b	NEW Ask date of invoice when using the Clone feature.	2019-04-12 12:12:08 +02:00
atm-quentin	6deba39c6a	FIX credit note can be split	2019-04-12 10:16:13 +02:00
atm-quentin	7ae6472e36	Merge branch '8.0' of github.com:Dolibarr/dolibarr into FIX_credit_note_used_on_list	2019-04-12 09:20:16 +02:00
Christophe Battarel	278b708e17	use subproducts costprice and pmp if empty on father	2019-04-11 11:57:50 +02:00
ATM john	29b31bd7ab	New title button first step	2019-04-11 00:38:44 +02:00
Laurent Destailleur	d7f980fda0	NEW Add picto of deletion on mass action combo lists	2019-04-09 01:22:59 +02:00
Laurent Destailleur	fff9b7db9d	Fix doxygen	2019-04-04 18:33:12 +02:00
Laurent Destailleur	5891d0a056	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/product/list.php htdocs/projet/list.php	2019-04-04 17:45:02 +02:00
Laurent Destailleur	37b8796f3c	NEW Add line total on list of payments	2019-04-02 17:54:34 +02:00
Laurent Destailleur	2b41d0c59d	Merge pull request #10938 from inoveaconseil/HookPrintFieldLIstFooter FIX missing hook	2019-03-31 18:44:07 +02:00
Laurent Destailleur	0d564cdd6c	Merge pull request #10919 from grandoc/new_branch_26_03_2019 New branch 26 03 2019	2019-03-31 18:23:05 +02:00
Laurent Destailleur	ec9fdc1321	Fix regression with class="right". Style of amount lost.	2019-03-31 11:25:29 +02:00
Laurent Destailleur	1b2826f476	Look and feel v10	2019-03-29 13:26:26 +01:00
Nicolas ZABOURI	0ab6b15779	FIX missing hook printFieldListFooter	2019-03-28 17:27:30 +01:00
Laurent Destailleur	a34f4c2806	Merge pull request #10909 from IonAgorria/fix-line-dates FIX: Disallow line start date after end date	2019-03-26 19:43:11 +01:00
Philippe GRAND	c15aa45cdb	fix : typo	2019-03-26 12:32:32 +01:00
Philippe GRAND	6c1ee52ac6	fix : typo	2019-03-26 12:31:56 +01:00
Laurent Destailleur	f27f65e8bf	Responsive	2019-03-25 10:09:02 +01:00
Ion	7bfa49b29c	FIX: Disallow line start date > end date	2019-03-24 14:30:00 +01:00
Laurent Destailleur	28fede950f	Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION	2019-03-22 13:00:48 +01:00
Laurent Destailleur	2b49c0f95e	Merge pull request #10904 from ATM-Nicolas/new_hidden_conf_edit_supplier_on_supplier_order NEW Hidden option MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER to edit supplier on draft supplier order	2019-03-22 12:32:44 +01:00
ATM-Nicolas	742f1cb8af	FIX : Show only suppliers	2019-03-22 10:55:49 +01:00
ATM-Nicolas	3149909896	FIX : Update ref_supplier too	2019-03-22 10:29:01 +01:00
ATM-Nicolas	0a23a1157f	NEW : Can edit supplier on draft order supplier	2019-03-22 10:28:55 +01:00
Philippe GRAND	77d93099ef	translation	2019-03-22 09:44:30 +01:00
Philippe GRAND	b8d04fa076	translation	2019-03-22 09:43:12 +01:00
Philippe GRAND	69906b9888	translation	2019-03-22 09:38:04 +01:00
Laurent Destailleur	ee4150665e	Fix phpcs	2019-03-21 20:15:19 +01:00
Laurent Destailleur	5693fbfe97	Merge pull request #10898 from grandoc/new_branch_21_03_2019 add some comments	2019-03-21 18:29:11 +01:00
Laurent Destailleur	930720decd	WIP Start to replace use of property ->brouillon	2019-03-21 18:13:51 +01:00
Laurent Destailleur	90df30e412	NEW Add trigget FICHINTER_UNVALIDATE Standardize code of setDraft.	2019-03-21 17:37:56 +01:00
Philippe GRAND	6babf88968	add some comments	2019-03-21 15:11:28 +01:00
Frédéric FRANCE	2fddf38da1	correct replacement of align	2019-03-19 12:55:33 +01:00
Laurent Destailleur	9a3c66b057	Merge pull request #10846 from grandoc/new_branch_15_03_2019 New branch 15 03 2019	2019-03-19 12:13:02 +01:00
Philippe GRAND	c13a1dbc63	translation	2019-03-18 13:45:24 +01:00
Philippe GRAND	0f03b16313	translation	2019-03-18 12:46:32 +01:00
Laurent Destailleur	f3cf3482fa	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/paiement/class/paiement.class.php htdocs/projet/element.php	2019-03-18 10:23:14 +01:00
Laurent Destailleur	34034787af	FIX problem with sign of various payment in project preview	2019-03-18 10:16:08 +01:00
Laurent Destailleur	f6285e7daf	Fix phpcs	2019-03-16 23:19:34 +01:00
Laurent Destailleur	dabccb7967	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/class/adherent.class.php htdocs/fourn/facture/paiement.php	2019-03-16 20:12:53 +01:00
Laurent Destailleur	8adc333823	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-16 19:41:50 +01:00
Maxime Kohlhaas	46b39dd6a9	Fix #9961 : deal with supplier credit note refund like with customers	2019-03-16 18:13:43 +01:00
Maxime Kohlhaas	21e2d36421	Fix #9311	2019-03-16 09:28:47 +01:00
Philippe Grand	8054f61bac	Update fournisseur.product.class.php Oops...to much alcohol..	2019-03-16 09:14:57 +01:00
Laurent Destailleur	c0b6699b25	All methods set_draft() were renamed into setDraft()	2019-03-15 19:01:40 +01:00
Laurent Destailleur	a2d6723ff3	WIP Link files to expense report lines	2019-03-15 15:07:52 +01:00
Philippe GRAND	2463ee47ba	update with html5 compliant code	2019-03-15 09:40:52 +01:00
Laurent Destailleur	86c5dc20e3	NEW Can choose the root category to show for TakePOS module	2019-03-15 02:12:40 +01:00
Laurent Destailleur	2713c430df	Merge branch 'develop' into dev_datepricefour	2019-03-14 18:43:09 +01:00
Laurent Destailleur	463c83efec	Update fournisseur.product.class.php	2019-03-14 18:37:03 +01:00
Laurent Destailleur	8f65ee2296	Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode	2019-03-14 17:48:44 +01:00
Laurent Destailleur	60db66d2bf	Update fournisseur.product.class.php	2019-03-14 17:41:33 +01:00
Laurent Destailleur	250e0bbaac	Update fournisseur.product.class.php	2019-03-14 17:40:39 +01:00
Laurent Destailleur	dd962fa044	Update fournisseur.product.class.php	2019-03-14 17:39:01 +01:00
Laurent Destailleur	eeafc3c630	Standardize translation of amount	2019-03-13 14:10:36 +01:00
Laurent Destailleur	98ca9bf17a	Reduce quantity of string to translates	2019-03-12 19:44:59 +01:00
Joan Louis	17647de4cc	Fix extrafields calls from cards for Dolibarr 8 See #10803	2019-03-12 11:24:54 +01:00
Joan Louis	f326c75be7	Update call to extrafields from cards	2019-03-11 21:34:16 +01:00
Joan Louis	ee5753819e	Update call to extrafields from cards	2019-03-11 14:22:04 +01:00
Laurent Destailleur	233bd4374a	Fix phpcs	2019-03-08 19:52:26 +01:00
Frédéric FRANCE	d96cc53f97	replace html by html5 in fourn	2019-03-07 20:46:38 +01:00
Laurent Destailleur	ddc52b7199	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/exports/export.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2019-03-07 14:13:38 +01:00
Laurent Destailleur	0729a3b571	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-07 14:11:12 +01:00
Laurent Destailleur	9a9fd15077	Fix doxygen	2019-03-07 14:10:33 +01:00
Laurent Destailleur	02b8bc94e7	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-07 14:06:31 +01:00
Laurent Destailleur	d2f1d0cc33	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/fourn/class/fournisseur.facture.class.php	2019-03-07 14:06:11 +01:00
Laurent Destailleur	e3fb228a4d	Update fournisseur.facture.class.php	2019-03-07 12:28:19 +01:00
gauthier	0ff2905180	FIX : we need to keep originline special_code	2019-03-06 12:10:24 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +01:00
Laurent Destailleur	8fce6e5e31	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/card.php htdocs/core/modules/mailings/xinputfile.modules.php htdocs/fourn/facture/card.php	2019-03-02 19:13:37 +01:00
Laurent Destailleur	40e923ec85	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/modules/modAgenda.class.php	2019-03-02 19:07:14 +01:00
Laurent Destailleur	4f9981063f	Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing	2019-03-02 18:26:50 +01:00
Laurent Destailleur	56d921ea52	CSS	2019-03-02 12:57:07 +01:00
Frédéric FRANCE	014f69850e	add visibility	2019-03-01 23:08:57 +01:00
Frédéric FRANCE	0022c4fe72	add visibility	2019-02-28 22:44:12 +01:00
Laurent Destailleur	a8f447498b	Fix applying of credit note on invoice	2019-02-28 19:30:44 +01:00
Laurent Destailleur	dddf322264	Fix bad position of parameters when creating supplier credit note	2019-02-28 19:06:51 +01:00
gauthier	786c114026	FIX : project_title for display of getNomUrl()	2019-02-28 16:13:45 +01:00
atm-quentin	72dc25552a	FIX better placement	2019-02-27 09:23:31 +01:00
atm-quentin	cb3a4ac94c	missing 1st char	2019-02-27 09:23:23 +01:00
atm-quentin	95593bfaad	fix scan barcode only one time instead of 2 (when it was focus we need to open and then write)	2019-02-27 09:23:06 +01:00
atm-quentin	f1055d0e5c	make select2 focus to earn time during scanning	2019-02-27 09:22:57 +01:00
atm-quentin	394659f84a	missing doc	2019-02-27 09:22:47 +01:00
atm-quentin	f51b89def3	NEW supplier buyprice barcode	2019-02-27 09:22:34 +01:00
Frédéric FRANCE	5a4ac82880	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 08:23:29 +01:00
Laurent Destailleur	014c199173	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/core/tpl/extrafields_list_print_fields.tpl.php	2019-02-27 01:28:12 +01:00
Laurent Destailleur	6f0d5fcf3f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/variants/combinations.php	2019-02-27 01:25:25 +01:00
Frédéric FRANCE	81f2f99db5	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-26 21:16:01 +01:00
Frédéric FRANCE	e6c3eb0ba1	wip	2019-02-26 21:13:07 +01:00
Laurent Destailleur	3ec2338c2d	Look and feel v10	2019-02-26 19:37:32 +01:00
Laurent Destailleur	6b46a927f1	Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket	2019-02-24 20:53:54 +01:00
Laurent Destailleur	6fdd0191f4	Merge pull request #10676 from frederic34/patch-5 fix #10656	2019-02-24 20:45:13 +01:00
Laurent Destailleur	7b2f4771f0	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-24 20:30:21 +01:00
Laurent Destailleur	5e6797f39d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-24 20:28:18 +01:00
Laurent Destailleur	2f300ae63f	Standardize code with customer invoices	2019-02-24 20:26:54 +01:00
Laurent Destailleur	f41d504ba1	Merge pull request #10518 from atm-greg/8.0_FIX_bad_values_in_fourn_credit_note FIX positive values IN supplier credit notes creating diff on addline rounding	2019-02-24 20:21:22 +01:00
Frédéric FRANCE	894123fb06	PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket	2019-02-24 20:06:55 +01:00
Frédéric FRANCE	ca2eba866c	Update list.php	2019-02-24 11:56:17 +01:00
Frédéric FRANCE	435b416f93	fix #10656	2019-02-24 11:50:06 +01:00
Laurent Destailleur	cdf85b0d00	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-23 16:02:35 +01:00
Laurent Destailleur	0081d3c25d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-23 16:02:10 +01:00
Francis Appels	c38b0c4dbe	FIX fk_default_warehouse missing in group by	2019-02-22 12:17:34 +01:00
Laurent Destailleur	ec5461a4d1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/multicurrency/class/multicurrency.class.php	2019-02-21 22:31:27 +01:00
Laurent Destailleur	6cdf5c5673	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-21 22:28:25 +01:00
atm-quentin	b6deda1111	FIX credit note used on list	2019-02-18 12:28:18 +01:00
gauthier	70f1a9d13d	FIX : we want to be able to reopen fourn credit note	2019-02-15 11:41:02 +01:00
Frédéric FRANCE	b6d665a91c	Update card.php	2019-02-14 20:38:21 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Frédéric FRANCE	580e5c42d2	GenericFunctionsFunctionCallArgumentSpacing	2019-02-09 12:00:49 +01:00
Laurent Destailleur	8760b1e592	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-08 12:57:50 +01:00
Laurent Destailleur	512ceae70a	Fix phpcs	2019-02-08 11:27:30 +01:00
Laurent Destailleur	38d4284638	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/db/pgsql.class.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/filefunc.inc.php htdocs/imports/import.php htdocs/supplier_proposal/card.php	2019-02-08 11:26:08 +01:00
Laurent Destailleur	fe1188c4ea	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/filefunc.inc.php	2019-02-08 10:44:45 +01:00
atm-greg	4624f1b1b8	FIX positive values creating diff on addline rounding	2019-02-06 17:19:16 +01:00
atm-quentin	da0c863f45	FIX supplier invoice payment total dont care about deposit or credit	2019-02-05 10:30:38 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	af9e2d07d2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/paiement.php htdocs/fourn/facture/paiement.php	2019-02-03 20:38:47 +01:00
Laurent Destailleur	4b77b3ff23	NEW Support tag {ccc} on payment ref	2019-02-03 20:36:20 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Frédéric FRANCE	03701fa091	psr2	2019-02-02 18:25:01 +01:00
Frédéric FRANCE	96de1b175c	clean missing spaces in the last merge	2019-02-02 08:51:30 +01:00
Frédéric FRANCE	f5b2cf75f2	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
Laurent Destailleur	3fc49a9de2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-01 16:07:27 +01:00
Laurent Destailleur	6de732d7f8	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/facture/mod_facture_mars.php htdocs/core/modules/facture/mod_facture_terre.php	2019-02-01 16:07:18 +01:00
Laurent Destailleur	35f65a571c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/modules/facture/mod_facture_mars.php htdocs/core/modules/facture/mod_facture_terre.php htdocs/fourn/commande/list.php	2019-02-01 16:05:43 +01:00
Laurent Destailleur	e366ab551c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-02-01 16:01:26 +01:00
Laurent Destailleur	dee2a373c1	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2019-02-01 16:01:18 +01:00
Laurent Destailleur	452dfafd32	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2019-02-01 15:56:47 +01:00
Francis Appels	cf9d87df4a	Fix travis	2019-02-01 15:40:56 +01:00
Francis Appels	c4915c679a	Merge develop	2019-02-01 11:47:03 +01:00
Francis Appels	2c5623c53e	check if price already logged, if not first log current price	2019-02-01 11:37:46 +01:00
florian HENRY	f7bed44441	FIX : quick search for supplier orders	2019-01-31 21:39:02 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
Laurent Destailleur	408609e0ec	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php htdocs/core/tpl/objectline_edit.tpl.php	2019-01-30 16:54:38 +01:00
Laurent Destailleur	9fdba921b4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php	2019-01-30 16:48:33 +01:00
Laurent Destailleur	81ae4c52c5	Merge pull request #10446 from mapiolca/8.0 Fix #10317 et #10318	2019-01-30 16:43:14 +01:00
Laurent Destailleur	e72d6c50e6	Merge pull request #10428 from frederic34/toomanylines PSR2.Files.EndFileNewline.TooMany	2019-01-30 16:17:09 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Laurent Destailleur	17c3337c9b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-30 15:25:43 +01:00
Regis Houssin	39b696af02	FIX multicompany compatibility	2019-01-29 12:01:40 +01:00
Pierre Ardoin	f9b8622545	Prise en charge de Multicompany Correction pour éviter que les factures appartenant à d'autres entités n'apparaissent dans celle qui est consultée sur le moment.	2019-01-29 11:33:22 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
John BOTELLA	9a666b265f	Use an other test	2019-01-28 11:53:19 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	f30a3d59ba	Merge branch 'develop' into toomanylines	2019-01-27 17:59:13 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Laurent Destailleur	d4daa6cebd	Merge pull request #10430 from frederic34/patch-18 typo in fournisseur.product.class.php	2019-01-27 17:51:49 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	0e3efadf59	typo in fournisseur.product.class.php	2019-01-27 14:37:37 +01:00
Frédéric FRANCE	496fa9b0fb	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	4a5d260db5	Update fournisseur.product.class.php	2019-01-26 14:07:37 +01:00
John BOTELLA	15e1d3b456	Fix fetch test	2019-01-24 09:40:58 +01:00
Francis Appels	1d08ccef07	Fix sql error	2019-01-22 16:39:54 +01:00
Francis Appels	7ad48064be	Add code to show in fourn price tooltip.	2019-01-22 16:18:25 +01:00
Francis Appels	946c017937	Fix and clean price log. Key should price id iso product id.	2019-01-22 15:59:47 +01:00
Laurent Destailleur	d38ed67a3c	Merge pull request #10383 from grandoc/new_branch_21_01_2019 update with html5 compliant code	2019-01-21 18:05:40 +01:00
Laurent Destailleur	42743027d4	Merge branch 'develop' into objectline_etc	2019-01-21 18:04:48 +01:00
Philippe GRAND	cdacfc5f37	update with html5 compliant code	2019-01-21 09:54:59 +01:00
torvista	07b2bb6715	Swap of align/valign/border/width for css Removal of type="text/javascript"	2019-01-20 23:36:39 +01:00
Laurent Destailleur	844643c37d	Merge pull request #10375 from grandoc/new_branch_19_01_2019 update with html5 compliant code	2019-01-20 19:48:32 +01:00
Laurent Destailleur	300889f53a	# WARNING: head commit changed in the meantime Fix	2019-01-19 13:22:38 +01:00
Philippe GRAND	549bbb06fc	update with html5 compliant code	2019-01-19 12:50:06 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
Laurent Destailleur	58bda12e22	css	2019-01-17 19:31:01 +01:00
Laurent Destailleur	5130019003	css	2019-01-17 19:27:26 +01:00
Laurent Destailleur	d5426730cb	Merge pull request #10318 from mapiolca/patch-6 FIX Multicompany	2019-01-10 14:01:19 +01:00
Laurent Destailleur	b4a6311f64	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-10 01:48:04 +01:00
Laurent Destailleur	057b606663	Fix tooltip	2019-01-09 15:03:44 +01:00
Laurent Destailleur	fbd490da15	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-09 13:29:47 +01:00
Laurent Destailleur	d1e062cafa	FIX When changing date of payment, change also record in bank if not conciliated yet.	2019-01-09 13:28:12 +01:00
Laurent Destailleur	d9999d61f6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-09 12:27:25 +01:00
Laurent Destailleur	890abd28d5	Fix look and feel v9	2019-01-09 12:26:49 +01:00
Laurent Destailleur	09fd3fce83	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-09 11:41:43 +01:00
Laurent Destailleur	61e9e8d60c	Fix missing link	2019-01-09 11:41:23 +01:00
mapiolca	caace3730d	Prise en charge de Multicompany Evite que les factures appartenant à d'autres entités n'apparaissent dans celle qui est consultée sur le moment.	2019-01-08 22:34:21 +01:00
ldestailleur	bc00fb177a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-02 19:42:15 +01:00
ldestailleur	3af418349a	FIX Can't empty the payment mode	2018-12-29 07:54:30 +01:00
Laurent Destailleur	3d30d8513f	Fix phpcs	2018-12-16 20:36:22 +01:00
Laurent Destailleur	f55db6dd84	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/resources/dbmodel/dolibarr_schema.mwb	2018-12-15 14:09:16 +01:00
Laurent Destailleur	27f8096afa	Merge branch 'develop' into PR_NEW_reception	2018-12-15 12:50:31 +01:00
Laurent Destailleur	699dc239d4	Fix US trans	2018-12-15 12:24:14 +01:00
Laurent Destailleur	b511a056f4	Fix phpcs	2018-12-15 11:48:21 +01:00
Laurent Destailleur	baf9b6f309	Fix regression (bad name of function)	2018-12-14 19:21:19 +01:00
Laurent Destailleur	4b90f88793	Merge pull request #10158 from defrance/patch-135 Refactoring list with dol_sql_datefilter function (end)	2018-12-14 19:06:54 +01:00
Laurent Destailleur	3571eaee3d	Merge branch 'develop' into NEW_change_order_concat_desc	2018-12-14 17:44:08 +01:00
Laurent Destailleur	88a52aa11d	Merge branch 'develop' into develop_mc	2018-12-14 15:58:52 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	83efdee7d3	Merge branch 'develop' into new_mass_generate	2018-12-14 15:44:46 +01:00
Laurent Destailleur	611ccc4a9a	Merge branch 'develop' into fieldlabel	2018-12-14 15:42:01 +01:00
Laurent Destailleur	5dabefe227	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-13 20:49:55 +01:00
Laurent Destailleur	f97b561af0	Merge branch 'develop' into qual_rename_facnumber	2018-12-13 20:24:12 +01:00
Laurent Destailleur	6ad106d14a	Update fournisseur.facture.class.php	2018-12-13 19:56:22 +01:00
atm-quentin	3da9650003	FIX if qty is 0	2018-12-10 16:06:11 +01:00
Laurent Destailleur	138640fc63	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php	2018-12-04 14:58:11 +01:00
Laurent Destailleur	8e333c3feb	Standardize code	2018-12-04 14:54:58 +01:00
Laurent Destailleur	d80baaea69	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php	2018-12-04 14:29:47 +01:00
Ferran Marcet	7247b14bd9	FIX Lines are not inserted correctly if VAT have code	2018-12-03 12:28:17 +01:00
Ferran Marcet	135a94dfed	Merge branch '7.0up' into 7.0	2018-12-03 11:59:46 +01:00
Ferran Marcet	8312d57d16	FIX Lines are not inserted correctly if VAT have code	2018-12-03 11:58:39 +01:00
Regis Houssin	8953a3ed73	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc Conflicts: ChangeLog	2018-12-03 08:46:03 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
BENKE Charlene	ad1ca07085	Update list.php	2018-12-02 09:58:18 +01:00
BENKE Charlene	1bc0defb31	Update list.php	2018-12-02 09:55:26 +01:00
Frédéric FRANCE	9692e98acf	Update fournisseur.facture.class.php	2018-12-01 22:49:12 +01:00
Laurent Destailleur	6d84036f66	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/index.php htdocs/contact/list.php htdocs/core/class/html.form.class.php htdocs/expensereport/card.php htdocs/install/doctemplates/shipment/template_shipment.odt htdocs/public/payment/newpayment.php	2018-12-01 19:23:06 +01:00
Laurent Destailleur	cb9ada2119	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/html.form.class.php htdocs/core/class/html.formmail.class.php htdocs/core/modules/modSociete.class.php htdocs/product/price.php	2018-12-01 18:19:45 +01:00
Maxime Kohlhaas	e8a02a971d	Fix #9074	2018-11-30 23:05:12 +01:00
Laurent Destailleur	ef3a280f40	Merge pull request #10082 from grandoc/new_branch_26_11_2018 fix typo error	2018-11-29 10:57:48 +01:00
Laurent Destailleur	0367795488	Fix auto jump on record if only 1 record in a search	2018-11-27 11:09:47 +01:00
Philippe GRAND	05d617b759	fix typo error	2018-11-26 14:33:45 +01:00
Laurent Destailleur	2fcd221dbb	Merge pull request #10048 from frederic34/patch-15 Update fournisseur.commande.class.php	2018-11-24 11:20:21 +01:00
Thibault Descamps	c2e5a29246	NEW redirect if only one result on global search on card	2018-11-22 11:36:30 +01:00
Thibault Descamps	1cc130e5f6	NEW : conf to change concat desc order	2018-11-21 09:57:44 +01:00
Laurent Destailleur	be4dc40dfa	Fix standardize date format for payment between customer and supplier	2018-11-20 10:16:54 +01:00
Frédéric FRANCE	2e4ec1ed10	Update fournisseur.commande.class.php	2018-11-19 23:56:20 +01:00
Laurent Destailleur	2f87ee6640	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-19 15:56:38 +01:00
Laurent Destailleur	f85ab8d0a6	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/card.php	2018-11-19 15:55:41 +01:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Regis Houssin	aaa9a4f47c	FIX use getEntity('invoice') instead getEntity('facture')	2018-11-15 17:27:49 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
gauthier	85dd0ec2dd	FIX : filter on product category doesn't work	2018-11-13 15:24:53 +01:00
tarrsalah	5eb897e049	FIX sql query performance on list_qualified_avoir_supplier_invoices.	2018-11-12 12:11:40 +01:00
Frédéric FRANCE	09efde4901	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-09 18:13:59 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Laurent Destailleur	f1193ad3dd	FIX: Missing date creation and modification of supplier price	2018-11-09 10:29:22 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Frédéric FRANCE	da3ee9ad9a	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-10-30 19:04:35 +01:00
Regis Houssin	9589f69574	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php	2018-10-30 18:29:28 +01:00
Laurent Destailleur	2c3cd7a668	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modSyslog.class.php	2018-10-30 15:32:09 +01:00
Laurent Destailleur	4dca94480e	Merge pull request #9892 from atm-maxime/fix_supp_inv_clone Fix invoice supplier clone was not getting all lines parameters #9800	2018-10-30 14:59:48 +01:00
Laurent Destailleur	cb2a5baa45	Merge pull request #9919 from atm-john/Fix_clone_fourn_invoice Fix clone fourn order and invoice lines special code	2018-10-30 14:55:50 +01:00
Laurent Destailleur	4a71374cf7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-30 14:48:09 +01:00
Laurent Destailleur	68f6ebd0ff	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/security.lib.php htdocs/modulebuilder/template/myobject_card.php	2018-10-30 14:47:39 +01:00
Laurent Destailleur	76c3bac777	Merge pull request #9900 from frederic34/patch-21 use strict compare	2018-10-30 14:23:14 +01:00
Laurent Destailleur	a16e7a84e9	Merge pull request #9899 from frederic34/patch-20 use strict compare	2018-10-30 14:23:01 +01:00
John BOTELLA	1e819ca7c1	FIX special code on create supplier invoice from supplier order	2018-10-30 10:46:33 +01:00
John BOTELLA	ca47d1b8b1	Fix clone fourn order and invoice lines special code	2018-10-30 10:26:59 +01:00
Laurent Destailleur	8fbf5b1f33	FIX deletion on draft is allowed if we are allwoed to create	2018-10-29 18:28:19 +01:00
Laurent Destailleur	0266db7aa8	FIX deletion on draft is allowed if we are allwoed to create	2018-10-29 18:19:40 +01:00
Laurent Destailleur	d02fccd7e4	Fix deletion of draft invoice	2018-10-29 14:56:00 +01:00
Laurent Destailleur	824757bca6	Fix perm to delete	2018-10-29 14:47:33 +01:00
Laurent Destailleur	27d82d0e8e	FIX Delete of draft invoice	2018-10-29 14:41:00 +01:00
Frédéric FRANCE	d7507ac858	use strict compare	2018-10-27 21:00:59 +02:00
Frédéric FRANCE	84219039a2	use strict compare	2018-10-27 20:57:59 +02:00
Frédéric FRANCE	e1625990f2	use strict compare	2018-10-27 20:54:53 +02:00
Frédéric FRANCE	fe5056add8	remove fieldlabel and add fieldeditkey	2018-10-27 18:07:05 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Maxime Kohlhaas	4ec80b5136	Fix invoice supplier clone was not getting all lines parameters #9800	2018-10-27 10:53:01 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
John BOTELLA	a380d3e89b	Fix missing group by in query	2018-10-24 09:21:30 +02:00
atm-john	bed5084bcf	Add missing Max payment date col	2018-10-23 21:44:45 +02:00
atm-quentin	04eb9ca167	fix dont change num version	2018-10-23 17:06:21 +02:00
atm-quentin	96d0bb8f2e	FIX adapt develop	2018-10-23 14:31:58 +02:00
atm-quentin	8442b405b2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception	2018-10-23 10:27:46 +02:00
atm-quentin	cfff4c7df8	NEW add ref supplier on supplier invoice	2018-10-22 14:32:50 +02:00
atm-quentin	eeb75bf650	FIX add object linked supplier order of reception	2018-10-18 10:26:32 +02:00
atm-quentin	dd0a57d39e	FIX pdf for creating invoice without massaction	2018-10-17 15:36:47 +02:00
atm-quentin	236a61ab55	new manage correctly create bills on reception	2018-10-17 11:56:32 +02:00
atm-quentin	f11e1940fc	NEW mass action list reception create bills for validated reception	2018-10-16 12:05:28 +02:00
atm-quentin	83c8a78628	NEW auto event msg	2018-10-15 17:08:28 +02:00
Maxime Kohlhaas	d4d921b1cc	Add massaction generate on main lists	2018-10-14 16:27:59 +02:00
atm-quentin	3e29b11890	NEW add field list if reception	2018-10-11 17:30:14 +02:00
atm-quentin	aaace60b0d	FIX stock movement on close reception and set status if too much receive$	2018-10-10 15:33:35 +02:00
Philippe GRAND	9b6367c1ee	Standardize and update code	2018-10-10 12:16:20 +02:00
atm-quentin	7ad4a7e384	NEW creation facture fourn depuis reception	2018-10-09 16:26:40 +02:00
Philippe GRAND	bba6669f03	Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018	2018-10-09 08:47:26 +02:00
atm-quentin	c6ab79bad3	NEW note, contact and lines on card	2018-10-08 16:54:33 +02:00
Laurent Destailleur	59a082d251	FIX Show the date of invoice on supplier payment	2018-10-06 21:33:43 +02:00
atm-quentin	6a8092dfae	NEW entete reception card	2018-10-05 16:21:50 +02:00
Philippe GRAND	073ec85208	Standardize code	2018-10-05 15:51:08 +02:00
Philippe GRAND	c7c3780400	clean code	2018-10-05 15:34:32 +02:00
atm-quentin	752c35d6d1	addline presque fini	2018-10-04 17:32:50 +02:00
Laurent Destailleur	ba3552558c	Merge pull request #9662 from frederic34/patch-17 remove useless param	2018-10-04 17:26:21 +02:00
Laurent Destailleur	9f2a2be837	Merge pull request #9661 from frederic34/patch-16 remove useless phpcs:disable	2018-10-04 17:25:44 +02:00
atm-quentin	5fe767d7bd	debut card create	2018-10-04 12:27:10 +02:00
atm-quentin	bc07936d42	NEW list on dispatch	2018-10-04 10:17:18 +02:00
atm-quentin	52717dbb65	NEW debut rename stock conf	2018-10-03 18:05:22 +02:00
Frédéric FRANCE	1735229f15	remove useless param /** * Return label of a status * * @param int $statut Id statut * @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto * @param int $billed 1=Billed * @return string Label of status */ function LibStatut($statut,$mode=0,$billed=0) {	2018-10-02 20:47:40 +02:00
Frédéric FRANCE	dae2757b73	remove useless phpcs:disable	2018-10-02 20:39:44 +02:00
Alexey Pyltsyn	49de7a5881	Replace multiple load calls with loadLangs method	2018-10-01 09:22:23 +03:00
Philippe GRAND	574cfad48f	Standardize and update code	2018-09-28 14:49:34 +02:00
Laurent Destailleur	d72446cebc	Merge pull request #9528 from grandoc/new_branch_16_09_2018 New branch 16 09 2018	2018-09-18 15:01:23 +02:00
Laurent Destailleur	ab0f842db6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-16 12:55:44 +02:00
Laurent Destailleur	74a9c680df	FIX "Other ..." link so the "Back to" link works.	2018-09-16 12:27:56 +02:00
Philippe GRAND	9f35767b4b	Standardize and update code	2018-09-16 11:53:49 +02:00
Philippe GRAND	251273e3c3	Standardize and update code	2018-09-16 11:50:29 +02:00
Philippe GRAND	cd8e0aa919	Standardize and update code	2018-09-16 11:47:56 +02:00
Philippe GRAND	120f823065	Standardize and update code	2018-09-16 11:45:18 +02:00
Philippe GRAND	988774120c	Standardize and update code	2018-09-16 11:42:20 +02:00
Philippe GRAND	ab92871dc3	Standardize and update code	2018-09-16 11:37:43 +02:00
Laurent Destailleur	d6ee00f2e7	Fix constructors does not need return value	2018-09-16 10:22:23 +02:00
Frédéric FRANCE	fafa7f18b1	reduce complexity libstatut fournisseur.commande;class.php	2018-09-15 22:24:57 +02:00
gauthier	7838b75ec9	FIX : wrong var name	2018-09-13 16:11:42 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Frédéric FRANCE	8249756726	replace select_date	2018-09-09 10:40:00 +02:00
Frédéric FRANCE	b2a58067d9	replace select_date	2018-09-09 09:56:33 +02:00
Laurent Destailleur	bcfb5fc42e	Merge pull request #9425 from atm-maxime/8.0 FIX : Homepage links were using wrong topmenus	2018-09-07 19:35:10 +02:00
Laurent Destailleur	ff05997f0a	FIX Several fixes on the management of minimal amount for orders	2018-09-06 17:37:02 +02:00
Maxime Kohlhaas	a5f4a74ecc	FIX : Homepage links were using wrong topmenus	2018-09-06 14:49:48 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Frédéric FRANCE	fd6281b364	move phpcs:ignore	2018-09-04 20:00:09 +02:00
Frédéric FRANCE	5f4a922c1d	move phpcs:ignore	2018-09-03 19:00:37 +02:00
Frédéric FRANCE	2a9ef8dc05	move phpcs:ignore	2018-09-02 22:05:19 +02:00
Frédéric FRANCE	35232b753a	move phpcs:ignore	2018-09-02 20:37:12 +02:00
Philippe GRAND	3de16a145e	Standardize and update code	2018-09-02 11:08:41 +02:00
Philippe GRAND	db32d8903e	Standardize and Update code	2018-09-01 23:20:20 +02:00
Philippe GRAND	7b0d3c32ab	Standardize and Update code	2018-09-01 22:55:10 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps mark non camelCaps function	2018-09-01 15:37:56 +02:00
Philippe GRAND	45cbc36a15	Standardize and update code	2018-09-01 15:27:55 +02:00
Philippe GRAND	17e349eba2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 14:27:53 +02:00
Laurent Destailleur	bcee0ef0ae	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/dispatch.php htdocs/societe/class/societe.class.php htdocs/stripe/config.php	2018-09-01 14:16:57 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	482ddd548a	Merge pull request #9332 from frederic34/functionClosingBrace PSR2 FunctionClosingBrace	2018-09-01 12:06:08 +02:00
Philippe GRAND	bb05e80a87	Standardize and update code	2018-08-31 18:47:25 +02:00
Philippe GRAND	9e880d3e72	Standardize and update code	2018-08-31 17:55:31 +02:00
Laurent Destailleur	9cc6533d11	Fix td alignement	2018-08-30 18:57:30 +02:00
Frédéric FRANCE	5100b8b7b0	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-30 10:42:47 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Laurent Destailleur	7211aff016	Update dispatch.php	2018-08-29 21:11:28 +02:00
Laurent Destailleur	a8bb55c66d	Merge branch '8.0' into 7.0_new_dispatch	2018-08-29 21:08:51 +02:00
Laurent Destailleur	88044a3d75	Update dispatch.php	2018-08-29 20:42:19 +02:00
Laurent Destailleur	489e766cbf	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/ticket/class/ticket.class.php	2018-08-29 20:24:01 +02:00
Laurent Destailleur	3ebfb23407	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .travis.yml htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/fournisseurs.php htdocs/ticket/class/ticket.class.php	2018-08-29 20:22:50 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Laurent Destailleur	86d8513138	Merge pull request #9309 from frederic34/trimtrailing2 last trimtrailing	2018-08-29 17:57:05 +02:00
Laurent Destailleur	7bf48b8d77	Fix date_start and date_end not saved on supplier invoice Conflicts: htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2018-08-29 17:26:41 +02:00
Laurent Destailleur	98356c6ed0	Fix date_start and date_end not saved on supplier invoice	2018-08-29 17:03:18 +02:00
Frédéric FRANCE	0e512cbc36	Merge remote-tracking branch 'upstream/develop' into trimtrailing2	2018-08-29 15:47:55 +02:00
Laurent Destailleur	ee204e2e64	Fix regression in php style	2018-08-29 15:37:35 +02:00
atm-quentin	76cb9f60c7	NEW hook on dispatch order fourn	2018-08-29 14:26:04 +02:00
Laurent Destailleur	b5c2383f65	Fix type of invoice encoded twice	2018-08-28 18:34:53 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Frédéric FRANCE	1182f29864	trimtrailing	2018-08-28 08:33:02 +02:00
Laurent Destailleur	50d50c2e10	Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info NEW On customer/supplier card, add simple tooltip to amount boxes	2018-08-28 02:48:05 +02:00
Laurent Destailleur	9a14611d55	Merge pull request #8996 from grandoc/new_branch_20_06_2018 clean and update code	2018-08-28 02:35:59 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing Trimtrailing	2018-08-28 02:30:02 +02:00
Marc de Lima Lucio	d09f9b2543	FIX: customer/supplier card: add simple tooltip to amount boxes	2018-08-27 18:19:42 +02:00
Philippe GRAND	87067b2bc9	Standardize and update code	2018-08-23 18:35:45 +02:00
Philippe GRAND	74ce0bfea6	Standardize and update code	2018-08-23 16:54:24 +02:00
Philippe GRAND	80b7229174	Standardize and update code	2018-08-23 11:34:55 +02:00
Philippe GRAND	9e900e583d	Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018	2018-08-23 11:13:54 +02:00
Philippe GRAND	aafa16afa5	Update and standardize code	2018-08-23 11:11:46 +02:00
Philippe Grand	f98d2078e2	Merge branch 'develop' into new_branch_20_06_2018	2018-08-23 10:41:34 +02:00
Philippe Grand	b817517997	Update fournisseur.product.class.php	2018-08-23 10:08:17 +02:00
Philippe Grand	0e3c9ffd51	Update fournisseur.facture.class.php	2018-08-23 10:05:02 +02:00
Philippe GRAND	0c75c41e7b	Update and standardize code	2018-08-22 19:56:24 +02:00
Philippe GRAND	06da7f54a2	Update and standardize code	2018-08-22 18:48:53 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	a36061079b	Update and standardize code	2018-08-22 11:11:59 +02:00
Philippe GRAND	a669830427	Update and standardize code	2018-08-22 10:37:16 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Laurent Destailleur	5c712a6cd3	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
Frédéric FRANCE	69a7af88e7	function declaration	2018-08-15 18:14:02 +02:00
Laurent Destailleur	ec56ad752c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-08-15 14:26:38 +02:00
Frédéric FRANCE	c0478cb42f	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-14 15:54:40 +02:00
Frédéric FRANCE	d30874750f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-14 09:02:12 +02:00
Laurent Destailleur	b98ee516d0	Merge pull request #9235 from grandoc/new_branch_13_08_2018 standardize code	2018-08-13 23:47:00 +02:00
Laurent Destailleur	b4a4ab4fa0	Merge pull request #9233 from grandoc/new_branch_12_08_2018 standardize code	2018-08-13 23:46:37 +02:00
delcroix Patrick	3b9266060c	Fix #9205 quote in Label/number on supplier payment # Fix #9205 #9205 the num_paiement wasn't escaped, not sure it's an real issue but it was reported here https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408	2018-08-13 23:42:18 +02:00
delcroix Patrick	cbdd1949df	Fix #9205 quote in Label/number on supplier payment # Fix #9205 #9205 the num_paiement wasn't escaped, not sure it's an real issue but it was reported here https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408	2018-08-13 20:39:20 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	b977c3a9f5	Fix translation	2018-08-13 14:04:10 +02:00
Philippe GRAND	f1f64db4dc	standardize code	2018-08-13 10:20:21 +02:00
Philippe GRAND	dc3a2ac26e	standardize code	2018-08-12 22:40:47 +02:00
Frédéric FRANCE	82e8efe792	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 20:14:14 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	0a1c6e7194	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/list.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-08-12 20:08:20 +02:00
Frédéric FRANCE	62db9a4022	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 19:54:03 +02:00
Laurent Destailleur	2d571acc03	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/commande/list.php	2018-08-12 19:25:44 +02:00
Laurent Destailleur	30b4d88428	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/list.php htdocs/product/reassort.php htdocs/societe/list.php	2018-08-12 19:23:45 +02:00
Laurent Destailleur	1b20d6feab	Merge pull request #9214 from atm-greg/Add_supplier_product_description NEW Can record the supplier product description	2018-08-12 18:56:27 +02:00
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
Frédéric FRANCE	79aaddbb66	test phpcs v3	2018-08-09 14:46:00 +02:00
Laurent Destailleur	61d7629ab1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php	2018-08-08 17:44:22 +02:00
Laurent Destailleur	8d54df4263	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php	2018-08-08 17:31:23 +02:00
Frédéric FRANCE	5f4d54ede5	correct space	2018-08-07 17:17:58 +02:00
Frédéric FRANCE	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
atm-greg	ad5f59822e	Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description	2018-08-07 09:33:30 +02:00
atm-greg	fc705e8510	Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description	2018-08-07 09:31:41 +02:00
atm-greg	c1de7fe8ac	fix update_buyprice	2018-08-07 09:15:30 +02:00
atm-greg	a8b33a1710	New fields desc_supplier on product_fourn_prices	2018-08-06 16:26:25 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
Laurent Destailleur	e85ec19018	Merge pull request #9093 from atm-gauthier/FIX_filters FIX : page must always be 0 when we search	2018-08-02 17:48:35 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include Include and co are statements	2018-08-02 11:03:44 +02:00
tarrsalah	8278a9fa52	FIX filter supplier invoice list by societe name.	2018-07-29 13:18:05 +01:00
Frédéric FRANCE	8312d95174	trim trailing	2018-07-26 18:22:16 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Philippe GRAND	ff04cb64c0	Clean and update code	2018-07-25 15:36:50 +02:00
Frédéric FRANCE	bde30b85ad	use defaut currency for supplier order	2018-07-24 17:06:12 +02:00
gauthier	80ff7fa86f	FIX : case when we valid form with keyboard	2018-07-11 15:18:30 +02:00
gauthier	103c7e6d06	FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)	2018-07-11 09:51:36 +02:00
Laurent Destailleur	5f52dfa873	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-10 14:02:40 +02:00
Regis Houssin	e8afd7e833	Fix: use "supplier" instead "reseller"	2018-07-07 08:48:26 +02:00
Regis Houssin	1522a5b22d	Fix: differentiate customer prices from supplier prices sharing	2018-07-07 08:43:59 +02:00
Laurent Destailleur	eb71810bdc	Merge pull request #8999 from dolibarr95/patch-46 NEW Add supplier ref in item reception page	2018-06-29 19:18:20 +02:00
Laurent Destailleur	569291763f	Update dispatch.php	2018-06-29 19:17:44 +02:00
Laurent Destailleur	da138db528	FIX combo into popup become crazy with IE10 Conflicts: htdocs/asset/card.php htdocs/modulebuilder/template/myobject_card.php	2018-06-28 12:16:12 +02:00
Laurent Destailleur	ed2ec78332	FIX combo of stock in popup are crazy in IE	2018-06-28 12:11:00 +02:00
Laurent Destailleur	3ea2d81279	FIX combo into popup become crazy with IE10	2018-06-28 12:05:02 +02:00
Laurent Destailleur	55d5d01cfe	FIX combo of stock in popup are crazy in IE	2018-06-28 11:53:52 +02:00
Philippe GRAND	1bb91c7860	update and clean code	2018-06-24 16:20:27 +02:00
Laurent Destailleur	af9d2c3b5a	Merge pull request #9008 from grandoc/new_branch_22_06_2018 clean and update code	2018-06-24 13:47:26 +02:00
Laurent Destailleur	0170906524	Look and feel	2018-06-23 14:39:24 +02:00
Laurent Destailleur	27a27e02a1	Fix css	2018-06-22 22:53:53 +02:00
Philippe GRAND	afda5288a8	clean and update code	2018-06-22 16:27:11 +02:00
Laurent Destailleur	07c514b85c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/class/fournisseur.product.class.php htdocs/projet/class/projectstats.class.php	2018-06-20 21:56:10 +02:00
Laurent Destailleur	9f2437fa04	Fix missing field	2018-06-20 17:59:01 +02:00
dolibarr95	3b33dad8fd	Add supplier ref Hi In all common case the supplier send a receipt with the parcel on which is writen his product ref (because this is his reference) with the quantity in the parcel and if he is smart/nice our reference. By adding the supplier ref column the supplier order dispatch is easier. Tks.	2018-06-20 14:40:32 +02:00
Philippe GRAND	4f554ab52a	clean and update code	2018-06-20 12:09:47 +02:00
Laurent Destailleur	9d048281dc	Merge pull request #8970 from inoveaconseil/FixParamGenerateDocument Fix missing params on generateDocument	2018-06-18 11:14:49 +02:00
Laurent Destailleur	187127ce6f	Fix CSS	2018-06-16 21:19:50 +02:00
Laurent Destailleur	8c748505db	Use parent instead of parents	2018-06-16 17:25:16 +02:00
Laurent Destailleur	7ad086bbdf	FIX Duplicate select2 when we split a supplier order receipt item	2018-06-16 17:18:17 +02:00
Laurent Destailleur	5524784421	FIX prefilled date of order must have hours too	2018-06-16 15:24:31 +02:00
Laurent Destailleur	7981bd08b7	Fix price+sql error when adding product when no supplier price defined	2018-06-16 14:47:33 +02:00
Laurent Destailleur	4898f10fa2	FIX Adding a product with no supplier price defined yet	2018-06-16 13:49:28 +02:00
Inovea Conseil	d5a3e63e05	Fix missing paramater for generateDocument	2018-06-15 09:47:28 +02:00
Marc de Lima Lucio	1dec4c4320	FIX: supplier order: product supplier ref not saved on addline	2018-06-14 10:37:40 +02:00
Laurent Destailleur	910652eb6d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang	2018-06-13 23:07:30 +02:00
Laurent Destailleur	4c2af6fc70	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/html.form.class.php	2018-06-13 23:04:08 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Laurent Destailleur	fdc90da408	Update card.php	2018-06-13 20:02:38 +02:00
altatof	d42f00bca9	FIX : pu_ht_devise was not converted to numeric so decimals were lost when clculating total_ht_devise	2018-06-13 16:35:52 +02:00
florian HENRY	8031ef49f2	fix error return	2018-06-05 20:38:55 +02:00
Laurent Destailleur	d8d4d15b4b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-30 12:13:40 +02:00
Laurent Destailleur	de59892438	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 12:13:18 +02:00
Laurent Destailleur	0412264418	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 12:05:54 +02:00
Laurent Destailleur	60321aabd8	Fix regression	2018-05-30 11:59:23 +02:00
Laurent Destailleur	c1f5c6becf	Merge pull request #8877 from frederic34/longlines soft limit length of lines to 500 chars	2018-05-30 11:19:29 +02:00
Laurent Destailleur	3733169120	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/recap-compta.php htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 11:09:53 +02:00
Laurent Destailleur	7590df85e6	Merge pull request #8887 from atm-florian/6.0 add hook on balence pages	2018-05-30 10:47:59 +02:00
Laurent Destailleur	e57ceab5de	Update fournisseur.commande.class.php	2018-05-30 10:45:06 +02:00
florian HENRY	b65b545e0f	add hook on balence pages	2018-05-29 16:29:14 +02:00
ATM-Nicolas	6b0b975ffd	FIX : Keep supplier proposal price for supplier order	2018-05-29 11:21:30 +02:00
Frédéric FRANCE	e2a557aadd	limit length of lines to 500 chars	2018-05-27 15:04:12 +02:00
Frédéric FRANCE	9cd7bb3f58	loadlangs	2018-05-26 16:03:19 +02:00
jean	eb39e5746e	Merge remote-tracking branch 'origin/develop' into dev_datepricefour	2018-05-25 15:32:15 +02:00
Laurent Destailleur	f58e0d3bcf	Fix scrutinizer errors	2018-05-23 08:24:20 +02:00
jean	1ab5eece6b	Adding code to show update date of supplier price shown	2018-05-22 09:40:49 +02:00
Laurent Destailleur	dd53f414f8	Merge pull request #8788 from bugness-chl/develop Fix #8722 useless sql ORDER BY	2018-05-18 11:16:08 +02:00
Laurent Destailleur	ef395fc36b	Fix scrutinizer bugs	2018-05-16 15:23:52 +02:00
Chl	9b2f62791b	Fix #8722 useless sql ORDER BY	2018-05-13 15:52:47 +02:00
Laurent Destailleur	9c68b81f59	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/accountancy/admin/account.php htdocs/projet/class/task.class.php	2018-05-05 14:34:54 +02:00
atm-greg	942e2f40bf	addline manage rank on its own if not provided	2018-05-02 17:07:27 +02:00
Laurent Destailleur	984ef37ff5	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-29 20:19:05 +02:00
Laurent Destailleur	9a345e99ef	Fix syntax error	2018-04-29 20:14:57 +02:00
Laurent Destailleur	0cdfd6800a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-29 20:11:47 +02:00
Laurent Destailleur	82a8513aed	Standardize code	2018-04-29 19:52:14 +02:00
Laurent Destailleur	a80621471c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php	2018-04-27 12:42:18 +02:00
Laurent Destailleur	e5df7e206b	Merge pull request #8224 from atm-ph/fix_6.0_supplier_order_from_supplier_proposal Fix wrong price on supplier order line	2018-04-27 12:20:49 +02:00
Laurent Destailleur	d179cafa9c	Update fournisseur.commande.class.php	2018-04-27 12:19:32 +02:00
Laurent Destailleur	ecd84f6c45	Update fournisseur.commande.class.php	2018-04-27 12:18:45 +02:00
Laurent Destailleur	4c87cbf644	Update card.php	2018-04-27 12:14:51 +02:00
Laurent Destailleur	1cbf5f1c5e	Merge pull request #8687 from dolibarr95/patch-43 NEW : Allow negative quantity for dispatch (supplier order)	2018-04-27 11:41:05 +02:00
Laurent Destailleur	0a4bd14bc3	Merge pull request #8678 from defrance/patch-111 add $user on delete line	2018-04-27 10:31:19 +02:00
Laurent Destailleur	2ecbd132aa	Merge pull request #8668 from tuxgasy/Add_Hook_ordersupplierdispatch New ordersupplierdispatch hook	2018-04-27 09:47:22 +02:00
Laurent Destailleur	59e5545aa7	Fix phpunit	2018-04-27 09:18:25 +02:00
dolibarr95	1fb6f79727	Update dispatch.php Only without batch module enabled	2018-04-27 09:14:52 +02:00
dolibarr95	14e68ea8f9	Allow qty to be negative	2018-04-26 16:42:08 +02:00
BENKE Charlene	c879232fd7	add $user on delete line possible to hamonize the call function for all line->delete ?	2018-04-24 23:41:12 +02:00
Laurent Destailleur	5eb7c7ffff	FIX Edit of ref_supplier in supplier invoice	2018-04-24 13:22:34 +02:00
Laurent Destailleur	9d070cac87	NEW Can add product in supplier order/invoice even w/o predefined price Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY, SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old behaviour.	2018-04-24 12:57:31 +02:00
Laurent Destailleur	461ae46cc4	FIX When on a high page and searching for a small result, list was not visible.	2018-04-24 11:37:57 +02:00
TuxGasy	6d552a2ae6	Add ordersupplierdispatch hook	2018-04-23 15:05:37 +02:00
Laurent Destailleur	e9a2894727	Fix PSR2	2018-04-22 20:59:29 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	fec9303d18	Remove useless $var	2018-04-22 18:51:03 +02:00
Laurent Destailleur	06e51703b1	Clean constructors	2018-04-21 16:01:05 +02:00
Laurent Destailleur	912d5c53f2	Standardize code	2018-04-21 15:54:05 +02:00
Laurent Destailleur	411949a6bb	Optimize constructors	2018-04-21 15:08:46 +02:00
Laurent Destailleur	ccd9aa8059	Fight against dolibarr warnings	2018-04-21 12:16:12 +02:00
Laurent Destailleur	cef9782179	Clean defined constant at begin of pages	2018-04-21 12:00:55 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	faea6861c3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/invoicetemplate_list.php htdocs/langs/en_US/bills.lang	2018-04-16 18:19:21 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	0d26bdcdc5	FIX Button receive products not visible	2018-04-16 11:20:29 +02:00
Laurent Destailleur	d549090290	Fix translation of button action must be a verb	2018-04-16 11:12:56 +02:00
Laurent Destailleur	2959dc4a3a	Fix regression	2018-04-15 18:20:04 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37:49 +02:00
florian HENRY	ad403c7045	fix syntax and uniformize code	2018-04-14 17:04:38 +02:00
Laurent Destailleur	b4ef3945d2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/facture/card.php	2018-04-13 23:52:08 +02:00
Laurent Destailleur	6a3c2f9808	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/fourn/facture/card.php	2018-04-13 23:27:14 +02:00
Laurent Destailleur	50a3b73a6f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-04-13 23:21:29 +02:00
Laurent Destailleur	3ec295935c	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-04-13 23:21:18 +02:00
Laurent Destailleur	c25e21de4b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-13 23:19:22 +02:00
Laurent Destailleur	8cfcdabcac	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2018-04-13 23:03:46 +02:00
atm-greg	4fae1e3236	rank of invoice_supplier lines was always -1	2018-04-13 17:01:10 +02:00
atm-greg	8d4126274a	rang was missing on order_supplier lines	2018-04-13 15:53:49 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	1521b0595b	Clean code	2018-04-13 11:03:03 +02:00
atm-greg	ef2c6a0ed4	fix sql error	2018-04-13 10:31:36 +02:00
atm-greg	58535993c1	use special_code on order_supplier lines	2018-04-13 10:31:27 +02:00
Laurent Destailleur	6e288fca75	Merge pull request #8575 from all3kcis/develop-patch-16 NEW Add files management on products lot	2018-04-13 00:57:13 +02:00
Laurent Destailleur	3078b890d4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/stripe/admin/stripe.php	2018-04-13 00:45:39 +02:00
Laurent Destailleur	f7bb781b42	FIX #8571	2018-04-13 00:43:15 +02:00
Laurent Destailleur	1c9661d9d6	FIX Update incoterm on supplier invoice	2018-04-12 21:39:12 +02:00
All-3kcis	880fa55dd5	display user-friendly filesize	2018-04-12 15:29:22 +02:00
Laurent Destailleur	ea2fd67e0d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang	2018-04-12 13:31:14 +02:00
Laurent Destailleur	307f217d56	Merge pull request #8543 from ATM-Nicolas/fix_duplicate_events FIX : multiple creation of same event	2018-04-11 16:28:32 +02:00
Laurent Destailleur	1feee6378f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-11 14:45:52 +02:00
ATM-Nicolas	cffe1e9771	FIX : Multiple creation of same event	2018-04-10 17:11:18 +02:00
Maxime Kohlhaas	cb1a011b50	Fix default currency not set on supplier order creation from commercial menu #8459	2018-04-10 14:14:16 +02:00
Laurent Destailleur	7108f68db9	Remove old deprecated hook insertExtraFields. Triggers must be used for action on CRUD events.	2018-04-10 12:03:01 +02:00
Laurent Destailleur	99ed9c4589	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/card.php htdocs/compta/facture/list.php	2018-04-08 13:10:10 +02:00
Laurent Destailleur	79af10fc83	Fix search filters	2018-04-08 13:01:42 +02:00
Laurent Destailleur	9e89675862	Fix creation of supplier invoice	2018-04-06 20:34:12 +02:00
François J	a78c064461	Fix CommandeFournisseur::getDispachedLines line ID & return quantity	2018-04-06 11:22:15 +02:00
Laurent Destailleur	e20585daed	Merge pull request #8505 from OPEN-DSI/fix-supplier-order-get-dispatched-line-id-add-quantity FIX CommandeFournisseur::getDispachedLines line ID & return quantity	2018-04-06 09:17:51 +02:00
Laurent Destailleur	9d9f3ddf85	Merge pull request #8502 from ATM-Marc/NEW_create_from_list NEW: generalize use of button to create new element from list	2018-04-05 16:40:15 +02:00
François J	041a21e829	Add tag @since	2018-04-04 14:05:50 +02:00
François J	9b61272bb7	Fix CommandeFournisseur::getDispachedLines line ID & return quantity	2018-04-04 12:32:49 +02:00
Laurent Destailleur	43f8834b28	Uniformize code with the new module builder framework	2018-03-31 18:48:27 +02:00
Marc de Lima Lucio	0366e645d5	NEW: generalize button to create object from list, for most of the lists	2018-03-30 16:54:38 +02:00
Laurent Destailleur	b5c53e9d76	Merge pull request #8469 from ATM-Marc/NEW_product_default_warehouse NEW: default warehouse field for products	2018-03-29 13:51:37 +02:00
Marc de Lima Lucio	3646374976	NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders	2018-03-28 11:54:21 +02:00
Alexandre SPANGARO	c012c330de	Merge remote-tracking branch 'uptream/develop' into 8.0-a11	2018-03-27 21:45:35 +02:00
Alexandre SPANGARO	6e27da605a	Add label project in tooltip in customer/supplier list	2018-03-27 21:41:25 +02:00
dolibarr95	5a63771c87	Add date	2018-03-27 15:11:42 +02:00
Laurent Destailleur	852191010a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-03-25 15:29:11 +02:00
Laurent Destailleur	934d2d8881	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/filefunc.inc.php	2018-03-25 15:27:31 +02:00
florian HENRY	46d2b4d62d	fix security check on fourn card	2018-03-22 23:25:54 +01:00
Laurent Destailleur	d4ae0395ed	NEW Look and feel v8: Use a different picto for delete and unlink	2018-03-18 19:13:42 +01:00
Laurent Destailleur	ff765a2efe	FIX Look and feel v7	2018-03-16 12:16:40 +01:00
Laurent Destailleur	273e1cdd8d	FIX Look and feel v7	2018-03-16 10:14:14 +01:00
Laurent Destailleur	620ceb54e3	Clean code to avoid confusion	2018-03-15 14:25:09 +01:00
Laurent Destailleur	93f4d6fdcd	Translation	2018-03-11 21:34:38 +01:00
Laurent Destailleur	64f21b8a3c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/card.php	2018-03-11 00:10:13 +01:00
Maxime Kohlhaas	d92fa3a69c	Fix required field + space in dispatch	2018-03-09 23:49:40 +01:00
Maxime Kohlhaas	d82c62b638	Fix supplier order clone was keeping objectlinked	2018-03-09 21:51:59 +01:00
Regis Houssin	f4f81482e7	Fix: add todo if you use the good id by entities	2018-03-09 09:39:57 +01:00
Regis Houssin	ea175cd6c1	Fix: compatibility with multicompany dictionnary sharing	2018-03-09 09:37:23 +01:00
atm-ph	53ce297ab3	Fix travis - missing documentation of new param	2018-03-09 09:30:11 +01:00
Laurent Destailleur	ad96229ec4	Fix not visible template selector for supplier order/invoice emails Conflicts: htdocs/fourn/facture/card.php	2018-03-08 20:52:25 +01:00
Laurent Destailleur	e983e0709f	Fix not visible template selector for supplier order/invoice emails	2018-03-08 20:49:37 +01:00
Laurent Destailleur	1c9e7145e7	Merge pull request #8276 from ATM-Consulting/develop_atm NEW: supplier credit notes & discounts (absolute and relative)	2018-03-08 20:06:37 +01:00
Laurent Destailleur	5b8006a6bb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/public/payment/paymentok.php htdocs/public/paypal/paymentok.php	2018-03-08 16:37:17 +01:00
Regis Houssin	93a9430e49	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
Laurent Destailleur	fe45e82e99	Fix use of table llx_c_paiement (param showempty was not used/set)	2018-03-07 19:00:38 +01:00
Laurent Destailleur	acc29ea163	FIX #8219	2018-03-07 16:19:13 +01:00
Laurent Destailleur	f4f009d877	FIX #8269	2018-03-07 16:10:40 +01:00
Laurent Destailleur	cf45f78d7e	Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency NEW Add multicurrency support for product buy price for supplier propales, orders and invoices	2018-03-07 13:12:23 +01:00
atm-ph	5971cd8e59	Fix label goes in desc and lost fourn ref	2018-03-05 17:18:03 +01:00
atm-ph	ebb4da8417	Fix keep supplier proposal price in supplier order	2018-03-05 16:58:35 +01:00
Marc de Lima Lucio	1765b09fda	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-05 11:05:38 +01:00
Marc de Lima Lucio	6a4a3c9e82	NEW: supplier credit notes: remove MAIN_FEATURES_LEVEL	2018-03-05 10:58:19 +01:00
Marc de Lima Lucio	451d943927	NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)	2018-03-02 16:48:25 +01:00
Laurent Destailleur	a3350d12d8	css	2018-03-01 23:51:06 +01:00
Marc de Lima Lucio	7cd1b2caa9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-27 16:45:01 +01:00
Marc de Lima Lucio	9cf45266f5	NEW: supplier relative discounts	2018-02-27 16:30:39 +01:00
Marc de Lima Lucio	239e834913	FIX: supplier credit notes: remove handled TODO	2018-02-27 10:04:02 +01:00
Laurent Destailleur	0cc84ab92f	FIX Missing restore_lastsearch_values	2018-02-26 21:21:28 +01:00
Laurent Destailleur	3c552cec15	FIX Missing restore_lastsearch_values	2018-02-26 21:16:40 +01:00
Laurent Destailleur	de89893d57	NEW Show total of time consumed in week in time spent entry page	2018-02-26 14:09:56 +01:00
kkhelifa-opendsi	90f4c985f6	Merge branch 'develop' into product_supplier_buyprice_multicurrency	2018-02-26 09:54:09 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	b52a2b12a5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 14:44:49 +01:00
Laurent Destailleur	2cd5ed65a6	Clean deprecated (field unit_charge in supplier price)	2018-02-25 14:13:09 +01:00
Laurent Destailleur	502f219f7f	Merge pull request #8231 from hregis/7.0_entity FIX missing object entity in fetch	2018-02-25 12:59:38 +01:00
Laurent Destailleur	d51355517b	Merge pull request #8216 from dolibarr95/patch-39 NEW Can dispatch if more than ordered (if hidden option set)	2018-02-25 12:30:32 +01:00
Regis Houssin	703d976b3b	Fix: missing object entity in fetch	2018-02-24 16:21:16 +01:00
Regis Houssin	b216249214	Fix: missing hook parameters	2018-02-24 15:01:29 +01:00
Laurent Destailleur	0a79550f43	Fix oldcopy must be saved before update_extras	2018-02-23 16:11:00 +01:00
atm-ph	d300b943e1	Fix wrong price on supplier order line	2018-02-23 15:10:25 +01:00
KHELIFA	54dba24ab5	Add multicurrency support for product buy price for supplier propales, orders and invoices	2018-02-23 11:06:07 +01:00
dolibarr95	6793d826b7	Dispatch if more than ordered If the constant SUPPLIER_ORDER_MORE_THAN_WISHED is set	2018-02-23 10:14:54 +01:00
Marc de Lima Lucio	876ea3198f	FIX: handle type in supplier invoice list	2018-02-21 17:51:44 +01:00
Marc de Lima Lucio	34d84c6d5d	FIX: supplier credit notes: display link to discount in supplier credit note card	2018-02-21 17:15:16 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
Laurent Destailleur	72c1357c9b	NEW Section of files generated by mass action not visible if empty	2018-02-21 11:02:45 +01:00
Marc de Lima Lucio	cfdbef6bc3	NEW: supplier credit notes: display supplier discounts in supplier card	2018-02-21 09:31:01 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	809ef1bd00	FIX Trigger _MODIFY must be called when editing a property event extra. Clean duplicate trigggers "_CLONE"	2018-02-20 18:09:38 +01:00
Marc de Lima Lucio	95be155010	FIX: supplier credit notes: harmonize discount filters	2018-02-20 12:26:29 +01:00
Marc de Lima Lucio	a4f2a2532d	FIX: supplier credit notes: use MAIN_FEATURES_LEVEL	2018-02-20 11:41:57 +01:00
Marc de Lima Lucio	bcb39e57fb	FIX: supplier credit notes: wrong credit note filter	2018-02-20 10:08:55 +01:00
Marc de Lima Lucio	a66f7b8bc8	FIX: supplier credit notes: wrong discount filters	2018-02-19 17:32:59 +01:00
Marc de Lima Lucio	57b8df4008	FIX: supplier credit notes: delete discount when deleting linked invoice/invoice line	2018-02-19 17:32:11 +01:00
Marc de Lima Lucio	f5ad93b272	NEW: supplier credit notes: handle Excess Paid + translation	2018-02-19 15:52:07 +01:00
Marc de Lima Lucio	924a9c392c	FIX: supplier credit notes: hide relative discounts until supported	2018-02-16 12:30:32 +01:00
Marc de Lima Lucio	7367769ec3	FIX: supplier credit notes: use correct rights in supplier invoice card	2018-02-16 11:59:51 +01:00
Marc de Lima Lucio	d2bb6a790b	NEW: supplier credit notes: display supplier discounts in supplier proposal card	2018-02-16 11:45:57 +01:00
Marc de Lima Lucio	905adab517	NEW: supplier credit notes: display supplier discounts in supplier order card	2018-02-16 11:23:59 +01:00
Marc de Lima Lucio	bd486e4cab	FIX: remove var_dump	2018-02-16 10:29:36 +01:00
Marc de Lima Lucio	e2b65b3755	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note	2018-02-16 09:14:53 +01:00
Laurent Destailleur	6b74c79798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/website.lang	2018-02-15 15:34:17 +01:00
Laurent Destailleur	825a295294	FIX #8198	2018-02-15 13:28:15 +01:00
Laurent Destailleur	f1a9f81fb4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/website.lang	2018-02-14 22:19:59 +01:00
Marc de Lima Lucio	daca27b2ed	NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring	2018-02-14 18:02:40 +01:00
Laurent Destailleur	536eb7e008	Fix label of invoice	2018-02-14 17:25:13 +01:00
Marc de Lima Lucio	4f9bb33600	NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid	2018-02-14 10:47:10 +01:00
Laurent Destailleur	109c447171	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 03:21:37 +01:00
Romain DESCHAMPS	37ff46b05a	add missing links in supplier card boxes	2018-02-12 02:40:09 +01:00
Laurent Destailleur	eccdc9a075	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php htdocs/langs/pt_PT/companies.lang	2018-02-08 15:20:24 +01:00
Laurent Destailleur	475b89bac1	Merge branch 'develop' into new_order_min_amount	2018-02-08 14:20:53 +01:00
Laurent Destailleur	074f4a3b46	Fix class not found when selecting project ref in lists	2018-02-06 00:34:14 +01:00
Laurent Destailleur	f57ea2682a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/contrat/card.php htdocs/core/class/commonobject.class.php htdocs/core/class/notify.class.php htdocs/societe/class/societe.class.php	2018-02-03 19:33:24 +01:00
Laurent Destailleur	d3a6342034	Fix regeneration of PDF after creation of payment.	2018-02-02 10:37:10 +01:00
atm-quentin	c80fa48225	FIX update_extras on fourn card	2018-02-01 09:31:04 +01:00
Laurent Destailleur	de0a8ba71f	Fix extrafields	2018-01-31 14:01:58 +01:00
Laurent Destailleur	e79f6fda2b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-26 01:23:18 +01:00
Laurent Destailleur	2c0eeaf8de	FIX #8093	2018-01-25 20:57:51 +01:00
Maxime Kohlhaas	9899a02630	Display alert if order total is under order min amount	2018-01-20 20:17:56 +01:00
Maxime Kohlhaas	6f248a6590	New allow to define order min amount	2018-01-20 20:17:56 +01:00
Laurent Destailleur	3871c694f6	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-17 19:50:33 +01:00
Laurent Destailleur	56d702e3c6	Fix missing property in tooltip	2018-01-17 16:26:24 +01:00
Laurent Destailleur	bc7bd77cea	Fix permission to open supplier order	2018-01-17 15:54:27 +01:00
Laurent Destailleur	d0680b429f	Fix name of file saved from tax document tab	2018-01-12 17:39:20 +01:00
Laurent Destailleur	5e7b814966	Fix responsive	2018-01-12 00:16:55 +01:00
Laurent Destailleur	e56d74f5c4	Fix generation of doc for supplier payment	2018-01-11 19:01:47 +01:00
Laurent Destailleur	0b893c11fd	Revert "Fix wrong address used into PDF model of supplier payment" This reverts commit `22d92c0540`.	2018-01-11 18:09:05 +01:00
Laurent Destailleur	af6b84ba3a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/list.php htdocs/contact/document.php htdocs/product/list.php	2018-01-11 01:03:13 +01:00
florian HENRY	fdedd6f75b	fix 7963	2018-01-08 20:54:40 +01:00
atm-ph	22d92c0540	Fix wrong address used into PDF model of supplier payment	2018-01-08 15:25:18 +01:00
Laurent Destailleur	d7837f8800	Try fix for #7778	2018-01-05 01:43:51 +01:00
Laurent Destailleur	60976c08e4	Merge pull request #8010 from atm-john/FIX_supplier_invoice_lines_extrafields_reception Fix extrafields transmition from supplier order to supplier invoice : lines part	2018-01-04 20:57:20 +01:00
florian HENRY	25390e5f73	fix : linked object (new format of linked_object atribut on 6.0)	2018-01-03 17:03:00 +01:00
John	9180121999	Fix extrafields transmition from supplier order lines to supplier invoice lines	2018-01-02 12:06:11 +01:00
Laurent Destailleur	6676178435	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contact/list.php htdocs/contrat/card.php	2017-12-28 09:56:40 +01:00
Laurent Destailleur	3ac413084f	Merge branch '6.0' into 6.0	2017-12-28 08:46:22 +01:00
Ferran Marcet	1c7b99d3dc	Fix: Missing include for Project class	2017-12-26 12:13:35 +01:00
Laurent Destailleur	eab44f62b1	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_builddoc.inc.php htdocs/core/class/html.form.class.php htdocs/core/tpl/admin_extrafields_add.tpl.php htdocs/core/tpl/admin_extrafields_edit.tpl.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/notes.tpl.php htdocs/main.inc.php htdocs/product/inventory/tpl/inventory.tpl.php htdocs/societe/tpl/linesalesrepresentative.tpl.php	2017-12-21 14:35:33 +01:00
Laurent Destailleur	6a62e13960	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 13:32:16 +01:00
Laurent Destailleur	4a5988accb	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 12:52:19 +01:00
Laurent Destailleur	b03d0134a7	Filter on date extrafield timestamp and datetime disabled (not possible yet)	2017-12-20 18:30:41 +01:00
Laurent Destailleur	2e87318b58	Fix sql error	2017-12-18 19:15:42 +01:00
Laurent Destailleur	1351a43a30	FIX Maxi debug of permission for users external or restricted to sales representatives	2017-12-18 16:13:05 +01:00
Laurent Destailleur	247c380d18	Several fixes	2017-12-12 16:11:40 +01:00
Laurent Destailleur	af1028576d	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
Laurent Destailleur	1251807f54	Fix several pb in links to projects on create page	2017-12-12 10:37:51 +01:00
Maxime Kohlhaas	8a39e2a413	Fix : no need for action button on cards, link is now available	2017-12-07 00:36:23 +01:00
Laurent Destailleur	93311e3817	FIX #7885	2017-12-05 12:31:57 +01:00
Laurent Destailleur	8019f73f99	Fix: protection to not delete invoice if invoice is in bookkeeping	2017-12-05 10:01:30 +01:00
Laurent Destailleur	46b281f703	Fix for #7697	2017-12-01 19:29:29 +01:00
fappels	cec490dff5	Fix dispatch not adapted for label to ref change for warehouse	2017-12-01 12:57:56 +01:00
Alexis ALGOUD	b2effa7cc8	fix travis	2017-11-30 11:36:35 +01:00
root	b7f26ea788	FIX add line bad price and ref	2017-11-30 11:10:01 +01:00
Laurent Destailleur	c1e6d35ca5	Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search factorization of extrafields into list	2017-11-28 12:14:47 +01:00
Laurent Destailleur	b63fb1f854	Support of VAT NPR in accounting module	2017-11-27 22:18:10 +01:00
Laurent Destailleur	a9d3e90b70	Big debug of accountancy module	2017-11-27 21:53:22 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
Laurent Destailleur	aaf08ade2f	Fix bug reported by scrutinizer	2017-11-25 11:21:31 +01:00
Laurent Destailleur	3db52b5f9e	Debug responsive of v7	2017-11-24 14:23:25 +01:00
Laurent Destailleur	6d5f2b2f21	Fix filters on surveys	2017-11-24 10:00:46 +01:00
Laurent Destailleur	9c22b5f335	Replace deprecated dol_print_graph with DolGraph	2017-11-23 20:24:05 +01:00
Laurent Destailleur	6a3dc91414	Standardize code	2017-11-23 15:22:32 +01:00
Laurent Destailleur	b93e35cdd2	Fix a lot of request to use the IN getentity instead of = Fix a lot of request to use left join on type of payment table	2017-11-23 15:06:16 +01:00
Laurent Destailleur	f68b2bdeca	Use the confirmation when deleting from mass action everywhere.	2017-11-15 11:39:11 +01:00
Laurent Destailleur	a12186a0b8	Use HTTP response code 304 instead of 500 when nothing is done	2017-11-14 01:26:02 +01:00
Laurent Destailleur	fdcbf082fd	Fix css	2017-11-12 19:39:02 +01:00
Laurent Destailleur	bf121f9b3c	Work on saving supplier_ref into database lines	2017-11-12 19:29:03 +01:00
Laurent Destailleur	836f6bf3c9	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
Laurent Destailleur	7e1e710d28	Merge pull request #7796 from IonAgorria/fix-price-dynamic Fix: price dynamic bugs	2017-11-11 17:49:00 +01:00
Laurent Destailleur	d1860b87f8	NEW Add a confirmation for all mass action 'delete'	2017-11-11 16:34:11 +01:00
Ion	e95ee4b878	Fix old parseProductSupplier call	2017-11-10 12:32:54 +01:00
Laurent Destailleur	a329f7dc75	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: build/exe/doliwamp/doliwamp.iss htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/list.php	2017-11-05 18:50:14 +01:00
Laurent Destailleur	d3a0cff30a	Merge pull request #7755 from frederic34/currency default currency on propal create	2017-11-05 18:28:40 +01:00
Laurent Destailleur	51c705a84b	NEW Reduce size of HTML page by removing duplicate tooltips	2017-11-05 01:00:15 +01:00
Frédéric FRANCE	b58df17545	default currency on propal create	2017-11-02 18:14:55 +01:00
Laurent Destailleur	1b28c45e2c	PERF Links in getNomUrl use only one tag a instead of 2.	2017-11-02 15:19:14 +01:00
Laurent Destailleur	e39c73a916	Fix translation	2017-11-02 14:16:28 +01:00
Laurent Destailleur	15272f6555	Return error code	2017-11-02 13:47:53 +01:00
Laurent Destailleur	d569218162	Fix 'separate' extrafields must be visible by default. Sandardize name of list pages (must end with _list.php)	2017-10-29 11:23:20 +01:00
Laurent Destailleur	e31223d7be	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-27 02:33:14 +02:00
Laurent Destailleur	6b7c59635e	Merge pull request #7715 from grandoc/new_branch_26_10_17 Fix : Warning: A non-numeric value encountered in on line 57 58 59	2017-10-27 02:18:26 +02:00
Laurent Destailleur	61909d842d	Update document.php	2017-10-27 02:18:11 +02:00
Laurent Destailleur	8058712d47	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/index.php htdocs/contrat/class/contrat.class.php htdocs/product/list.php	2017-10-26 17:06:11 +02:00
Laurent Destailleur	67208b111d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/compta/facture.php htdocs/expedition/card.php htdocs/product/list.php	2017-10-26 17:02:40 +02:00
Philippe GRAND	d9d4b6e06d	Fix : Warning: A non-numeric value encountered in on line 57 58 59	2017-10-26 13:03:39 +02:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	58584d8784	Update fournisseur.commande.class.php	2017-10-24 13:05:12 +02:00
dolibarr95	76aa2df807	Try to fix #7692 `$this->fk_soc` is empty replace by `$this->socid`	2017-10-24 13:05:05 +02:00
Laurent Destailleur	169d454811	Update fournisseur.commande.class.php	2017-10-24 13:01:48 +02:00
dolibarr95	a3dfbf854a	Try to fix #7692 `$this->fk_soc` is empty replace by `$this->socid`	2017-10-24 09:22:13 +02:00
Laurent Destailleur	c6e5115d34	Set default limit to 100 on all rest api that list	2017-10-22 15:42:19 +02:00
Laurent Destailleur	98674f6d82	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/facture/card.php htdocs/societe/class/api_contacts.class.php htdocs/societe/class/api_thirdparties.class.php	2017-10-22 15:01:35 +02:00
Laurent Destailleur	be0cd601a9	Fix dead code	2017-10-22 14:07:54 +02:00
Laurent Destailleur	703d4a6aee	FIX #7648	2017-10-22 14:02:24 +02:00
Laurent Destailleur	c9fceaad3c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/index.php htdocs/fourn/facture/card.php	2017-10-22 04:04:26 +02:00
Laurent Destailleur	728e36f70f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/api/index.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/api_invoices.class.php htdocs/core/actions_massactions.inc.php htdocs/core/actions_sendmails.inc.php	2017-10-22 01:43:33 +02:00
Frédéric FRANCE	8baad70f6c	stock on supplier invoice back to draft	2017-10-21 20:26:32 +02:00
Laurent Destailleur	f7556e7ad2	FIX make of link to other object during creation	2017-10-19 19:06:48 +02:00

... 22 23 24 25 26 ...

5736 Commits