dolibarr

mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00

Author	SHA1	Message	Date
Alfredo Altamirano	b6882af1b6	Add hidden options to send by email for all status	2019-10-03 20:21:13 -05:00
Laurent Destailleur	24570f7165	Look and feel v11. Picto are fontawesome.	2019-10-02 18:14:41 +02:00
Laurent Destailleur	68055e579f	Check array is array	2019-10-01 16:26:55 +02:00
Laurent Destailleur	b79831ec39	Merge pull request #11952 from aspangaro/11.0_https Move Gnu.org to https	2019-10-01 14:48:21 +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
Frédéric FRANCE	f3a38ef1af	Update api_orders.class.php	2019-09-30 21:41:07 +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	86e5465197	Standardize extrafields code	2019-09-28 10:55:09 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Alexandre SPANGARO	1c13a38ce9	Typo abscissa	2019-09-23 21:45:23 +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
Regis Houssin	5f23ba5467	FIX avoid non numeric warning	2019-09-12 08:04:53 +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	626e3fd90e	Fix look and feel v10	2019-09-06 02:34:24 +02:00
Christophe Battarel	32c6c754c4	Merge branch 'develop' into oldline	2019-09-05 16:19:38 +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 Traullé	c32c7d48ba	Fix Wrongly catched examples by Doxygen	2019-08-30 17:14:59 +02:00
Laurent Destailleur	05c9e97fe4	The deprecated method get_OutstandingBill has been removed. You can use getOutstandingBills() instead.	2019-08-29 00:45:02 +02:00
Laurent Destailleur	f9094cfc44	Update card.php	2019-08-27 15:00:41 +02:00
Maxime Kohlhaas	9c09876bd4	Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin	2019-08-27 14:33:34 +02:00
Maxime Kohlhaas	4bd806ea65	Move $selectedlines to parameter	2019-08-27 14:33:28 +02:00
Laurent Destailleur	3eb32360ce	Fix escape	2019-08-27 14:10:23 +02:00
Laurent Destailleur	9e04eccf54	Fix syntax error	2019-08-26 23:28:06 +02:00
Frans Bosman	23311abd6a	Update card.php	2019-08-25 19:57:49 +02:00
Frans Bosman	a822a34a51	Update card.php	2019-08-25 19:54:42 +02:00
Frans Bosman	e15d91640b	Update card.php	2019-08-22 09:43:04 +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
Regis Houssin	7c8b3c9a38	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-08-13 07:34:02 +02:00
Laurent Destailleur	ee37cbd412	Merge pull request #11638 from ptibogxiv/patch-212 NEW list by date_cloture on order list	2019-08-10 01:06:16 +02:00
Laurent Destailleur	14fabeb377	Variable rangtouse -> ranktouse	2019-08-10 00:46:20 +02:00
ptibogxiv	0cbb144628	Update list.php sometimes we need to get last update or closed order	2019-08-05 20:52:27 +02:00
ptibogxiv	f417c85186	NEW list by date_cloture on order list	2019-08-05 20:49: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
Regis Houssin	d9ea61e47c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu Conflicts: htdocs/commande/class/commande.class.php	2019-07-31 12:49:56 +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
Maxime Kohlhaas	5c2763d0dd	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin	2019-07-27 10:53:43 +02:00
Laurent Destailleur	865ebb9de2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/ticket/class/ticket.class.php	2019-07-20 13:29:10 +02:00
Laurent Destailleur	e5c3945ec3	FIX delete of links between objects	2019-07-19 18:10:45 +02:00
Laurent Destailleur	361fc53685	FIX div not balanced	2019-07-19 17:47:54 +02:00
Regis Houssin	cbda42d146	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-07-19 09:37:34 +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	f44182c89f	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-07-16 00:13:52 +02:00
Regis Houssin	294bc5dcb5	FIX avoid conflict with "$classname" in card.php	2019-07-15 10:19:06 +02:00
Maxime Kohlhaas	9c47cb6f91	NEW : can choose lines while creating order from origin	2019-07-08 23:16:32 +02:00
Laurent Destailleur	0a7d70829f	Translation of some comments	2019-07-05 21:37:25 +02:00
Laurent Destailleur	7de92070d7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contrat/card.php htdocs/contrat/class/contrat.class.php	2019-06-29 16:46:16 +02:00
Laurent Destailleur	adb3062a9f	Work on nblignes -> nblines	2019-06-29 16:38:14 +02:00
ptibogxiv	174e531d69	Update commande.class.php	2019-06-25 18:12:16 +02:00
ptibogxiv	9e88bf1f1c	NEW multilangs in fetch_lines	2019-06-25 15:41:20 +02:00
Laurent Destailleur	fa476b4994	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +02:00
Laurent Destailleur	5675e7c50e	Clean code of deprecated method	2019-06-22 18:19:40 +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	a74eaaff4d	Fix sort of linked elements	2019-06-17 15:54:54 +02:00
Regis Houssin	6597c9f60d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-17 06:45:08 +02:00
ptibogxiv	651f4158ac	Fix add / delete contact access	2019-06-16 14:18:26 +02:00
ptibogxiv	70d9d3ab4c	FIX contact default list with adding job/function as my last commit it's same contact but différent job / function. More clear for choosing right contact in the list (PR from my dolibarr's customer)	2019-06-04 18:23:25 +02:00
Regis Houssin	38246b4088	NEW add new function "setEntity()"	2019-06-03 11:13:26 +02:00
Regis Houssin	7b8b1a9052	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-03 11:04:28 +02:00
Laurent Destailleur	2218994958	FIX Duplicate encoding on error message	2019-05-29 09:51:45 +02:00
Lionel VESSILLER	1c1b3c376e	Fix check if order line is not in a shipment line before deleting	2019-05-23 15:57:02 +02:00
Regis Houssin	4f2f23f522	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-22 08:45:31 +02:00
Laurent Destailleur	22e897b1a1	Clean and prepare code to fix a SQL injection	2019-05-21 17:22:38 +02:00
Regis Houssin	2cf630c213	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-20 16:10: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
florian HENRY	02af7ca25e	fix pb with multicompny payment dictionnary on faxcture card	2019-05-18 12:11:28 +02:00
Francis Appels	a2d4a59321	Merge branch 'develop' into clean_10_beta	2019-05-13 21:27:13 +02:00
Laurent Destailleur	5876582030	Fix responsive	2019-05-12 15:56:29 +02:00
Regis Houssin	b73df2698d	FIX better compatibility with Multicompany	2019-05-12 14:25:41 +02:00
Laurent Destailleur	3def11d5c9	Standardize translation	2019-05-10 19:32:46 +02:00
Laurent Destailleur	9de0e69456	FIX column project into list	2019-05-10 15:11:06 +02:00
Laurent Destailleur	5625c94c44	Fix missing label on project tooltip	2019-05-10 14:40:15 +02:00
Laurent Destailleur	0e8184332e	Fix missing label on project tooltip	2019-05-10 14:39:05 +02:00
Laurent Destailleur	a94c291b76	Dolibarization	2019-05-09 16:59:06 +02:00
Francis Appels	18c5c586ab	Cleanup set_draft in syslog	2019-05-01 09:38:27 +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	f45462b409	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2019-04-17 10:39:49 +02:00
Laurent Destailleur	e6ffaeefe5	CSS	2019-04-17 10:39:30 +02:00
ATM john	292d9c38a5	Appli function to links	2019-04-15 00:21:58 +02:00
Francis Appels	d08db86ba1	Fix customer order updateline	2019-04-11 18:55:16 +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	7b01e76d2b	Fix doxygen	2019-04-08 16:04:15 +02:00
Laurent Destailleur	917b9d69fa	Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and not recommanded to use in Dolibarr.	2019-04-08 14:55:31 +02:00
Laurent Destailleur	31963be6a0	Merge pull request #10922 from altatof/cloneorder clone of order like in propal (ref_client, contacts)	2019-03-31 18:25:48 +02:00
Laurent Destailleur	361254a4c0	Fix regression after renamind valdate_invoices	2019-03-31 18:23:54 +02:00
Laurent Destailleur	1b2826f476	Look and feel v10	2019-03-29 13:26:26 +01:00
Christophe Battarel	631be04d5d	better clone oldline and avoid emptylabel on update	2019-03-27 12:15:50 +01:00
Christophe Battarel	3006e2bf75	memorize line before delete (for triggers)	2019-03-27 12:05:42 +01:00
Christophe Battarel	c9b321ded4	add global conf to createfromclone	2019-03-27 10:32:40 +01:00
Christophe Battarel	f1548bd253	fix objfrom	2019-03-27 10:27:08 +01:00
Christophe Battarel	9efb1b9525	copy internal and external contacts when cloning like in propal	2019-03-27 10:09:45 +01:00
Christophe Battarel	1b9cdd021a	test constant for keeping customer ref on clone of order like in propal	2019-03-27 10:00:29 +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
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	20f3af066c	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/tva/clients.php	2019-03-23 22:44:14 +01:00
Laurent Destailleur	5666fbedac	FIX If we build one invoice for several orders, we must put the ref of order on the line to not lose information.	2019-03-23 22:30:52 +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	a7181750c6	Merge pull request #10879 from altatof/noconcatdesc NEW : add constant NO_CONCAT_DESCRIPTION	2019-03-22 12:56:46 +01:00
Philippe GRAND	b8d04fa076	translation	2019-03-22 09:43:12 +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
Laurent Destailleur	5d21547854	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php htdocs/product/price.php htdocs/user/perms.php	2019-03-21 12:20:24 +01:00
Laurent Destailleur	41c737a213	Fix, Oops, test was inverted	2019-03-18 20:16:19 +01:00
Laurent Destailleur	aa013ff753	Fix do we really must copy notes when creating an object from another source object? Add a hack with hidden option to be able to change this.	2019-03-18 20:09:09 +01:00
Christophe Battarel	8b3fd2eacf	NEW : add constant NO_CONCAT_DESCRIPTION	2019-03-18 16:10:17 +01:00
Philippe GRAND	c13a1dbc63	translation	2019-03-18 13:45:24 +01:00
Laurent Destailleur	7cdfff7263	Fix syntax error	2019-03-15 20:42:49 +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
Laurent Destailleur	cdf6e4b65a	Fix some PSR rules	2019-03-14 16:43:27 +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	f326c75be7	Update call to extrafields from cards	2019-03-11 21:34:16 +01:00
Laurent Destailleur	e913f1919f	Merge pull request #10803 from joanlouis/fix-extrafields-calls-from-cards Update call to extrafields from cards	2019-03-11 21:14:53 +01:00
Joan Louis	ee5753819e	Update call to extrafields from cards	2019-03-11 14:22:04 +01:00
John BOTELLA	97544e0aea	add new dolGetStatus to LibStatut in common invoice class	2019-03-07 15:24:11 +01:00
John BOTELLA	ca10b1e403	add new dolGetStatus to LibStatut in product class	2019-03-07 11:37:54 +01:00
John BOTELLA	5ea5d51247	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-07 09:41:03 +01:00
Laurent Destailleur	401ad65975	Fix API explorer was broken due to corrupted API	2019-03-06 18:04:36 +01:00
John BOTELLA	5fd3a253ab	add new dolGetStatus to LibStatut in order class	2019-03-06 14:19:40 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +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	796ea6f4ea	add visibility	2019-02-28 23:19:58 +01:00
Frédéric FRANCE	7e31ca48d8	add visibility	2019-02-28 22:07:48 +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
Laurent Destailleur	3ec2338c2d	Look and feel v10	2019-02-26 19:37:32 +01:00
Frédéric FRANCE	42a1387218	wip	2019-02-25 00:56:48 +01:00
ptibogxiv	25d4be0772	Update commande.class.php	2019-02-20 12:29:47 +01:00
Frédéric FRANCE	2ede3c1a40	Update list.php	2019-02-14 19:04:07 +01:00
ptibogxiv	58a73e7b4c	Update api_orders.class.php	2019-02-14 00:42:00 +01:00
ptibogxiv	7ac47fabda	NEW link/delete contact in order object	2019-02-14 00:36:35 +01:00
Laurent Destailleur	a39b4bcb7d	Update api_orders.class.php	2019-02-13 16:39:45 +01:00
Jimmy L	a172ea00a4	Rest API: Proposal, Orders, Invoices: Add contact details	2019-02-12 17:54:59 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Philippe GRAND	71e99e0972	update with html5 compliant code	2019-02-04 10:42:40 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +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
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +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
Philippe GRAND	540e6d6f79	update with html5 compliant code	2019-01-23 17:34:30 +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
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
Philippe GRAND	336be085f6	update with html5 compliant code	2019-01-19 12:28:18 +01:00
Laurent Destailleur	5130019003	css	2019-01-17 19:27:26 +01:00
Philippe GRAND	1a55d5fe85	update with html5 compliant code	2019-01-17 14:27:07 +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	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	38ddfd9a62	Merge pull request #10152 from defrance/patch-134 refactoring list.php with dol_sql_datefilter	2018-12-14 19:06:29 +01:00
Laurent Destailleur	3571eaee3d	Merge branch 'develop' into NEW_change_order_concat_desc	2018-12-14 17:44:08 +01:00
Laurent Destailleur	9fb672d51b	Merge pull request #10127 from atm-florian/develop_scrunitizer fix scrunitizer	2018-12-14 17:28:34 +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	233e160489	Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2 NEW Extend import option to Order's card and Propal's card	2018-12-14 15:29:27 +01:00
Laurent Destailleur	f97b561af0	Merge branch 'develop' into qual_rename_facnumber	2018-12-13 20:24:12 +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	8312d57d16	FIX Lines are not inserted correctly if VAT have code	2018-12-03 11:58:39 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
BENKE Charlene	0d35f04cb7	Update list.php	2018-12-01 23:36:26 +01:00
florian HENRY	d928372239	fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/commande/class/commande.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0	2018-12-01 14:51:22 +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
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
JC Prieto	deff4ca4a0	Update list.php Missing the following lines to search total_ttc	2018-11-19 20:03:36 +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
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
gauthier	66ea8bbe87	FIX : fourn payment modes musn't be available on customer docs	2018-11-12 15:58:41 +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	3e844db74f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fichinter/stats/index.php	2018-11-08 20:19:28 +01:00
John BOTELLA	98548337ae	FIX supplier order list keep socid	2018-11-08 15:38:25 +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	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	afe61579e8	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-10-30 14:29:26 +01:00
Laurent Destailleur	b0ef8680ff	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-30 14:28:25 +01:00
Frédéric FRANCE	c92a2084f1	remove fieldlabel and add fieldeditkey	2018-10-27 14:50:27 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Frédéric FRANCE	9c7ec434b7	remove fieldlabel and add fieldeditkey	2018-10-27 13:48:30 +02:00
Frédéric FRANCE	d67c40dffe	remove fieldlabel and add fieldeditkey	2018-10-27 13:01:01 +02:00
Frédéric FRANCE	f29ee25ea7	remove fieldlabel and add fieldeditkey	2018-10-27 11:06:45 +02:00
Frédéric FRANCE	a30091fd74	Update commande.class.php	2018-10-27 09:51:19 +02:00
Laurent Destailleur	852b069785	Fix reponsive in stats pages	2018-10-26 15:46:17 +02:00
atm-john	759b2b6ccf	Extend import option to Order's card and Propal's card	2018-10-25 21:39:22 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	01adaf253c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/class/account.class.php htdocs/product/list.php	2018-10-24 03:35:44 +02:00
Laurent Destailleur	c8aa884462	Fix search all	2018-10-23 17:16:46 +02:00
Laurent Destailleur	5f309bf155	Update commande.class.php	2018-10-19 13:38:23 +02:00
ptibogxiv	7c35eae202	Update commande.class.php	2018-10-17 00:06:24 +02:00
ptibogxiv	27b7cf8bea	Fix uniformization dates of order in API	2018-10-16 23:31:19 +02:00
Maxime Kohlhaas	d4d921b1cc	Add massaction generate on main lists	2018-10-14 16:27:59 +02:00
Philippe GRAND	af0bcb2631	Standardize code	2018-10-09 09:40:00 +02:00
Laurent Destailleur	b3b2305651	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/pdf.lib.php	2018-10-04 17:56:56 +02:00
Laurent Destailleur	13759ea146	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/class/facture.class.php	2018-10-04 17:53:40 +02:00
aplose	8ee7a48583	Fix issue #9434 : no array_options available when calling api : I replace the deprecated code by the fetch_optionnals() recommanded call.	2018-10-03 15:15:46 +02:00
Laurent Destailleur	26d20d0b76	Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price NEW Advanced permission to ignore price min	2018-09-27 09:57:49 +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
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	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Frédéric FRANCE	a3fa13994b	replace select_date	2018-09-09 09:36:12 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Laurent Destailleur	ff05997f0a	FIX Several fixes on the management of minimal amount for orders	2018-09-06 17:37:02 +02:00
Philippe GRAND	3c06527a7b	Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018	2018-09-06 09:50:12 +02:00
Frédéric FRANCE	4cbfa2073a	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 21:02:16 +02:00
Laurent Destailleur	4ac67e6409	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-05 20:31:10 +02:00
Frédéric FRANCE	4e619dd0ed	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 18:51:21 +02:00
Laurent Destailleur	f1cb13634b	FIX Entering negative price on order	2018-09-05 14:55:45 +02:00
Philippe GRAND	38ca6096b2	Standardize and update code	2018-09-05 10:31:12 +02:00
Laurent Destailleur	ab8155f170	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php htdocs/filefunc.inc.php	2018-09-04 21:35:43 +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	bdcac95761	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 15:15:23 +02:00
Philippe GRAND	0492492df1	fix merge	2018-09-04 12:30:06 +02:00
Laurent Destailleur	3ef808cb9b	Fix #9302 MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES broken	2018-09-04 11:23:28 +02:00
Laurent Destailleur	3d50c454c1	Code comment	2018-09-03 17:05:44 +02:00
Philippe GRAND	3de16a145e	Standardize and update code	2018-09-02 11:08:41 +02:00
Frédéric FRANCE	e98b8e5e25	move phpcs:ignore	2018-09-02 09:27:59 +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	f77dd2ebc7	Standardize and update code	2018-09-01 15:13:59 +02:00
Philippe GRAND	c013f9cf3d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 15:13:04 +02:00
Laurent Destailleur	c2548b8b39	Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm NEW hook formConfirm always called if hooked	2018-09-01 14:50:08 +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	7354e485b0	precise label comment	2018-09-01 13:22:08 +02:00
ksar-ksar	49d3bea192	Remove the test After discussion with Frederic, the best solution is to remove the test	2018-08-30 11:27:48 +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	57207794c2	tabs added	2018-08-30 10:30:52 +02:00
Frédéric FRANCE	1bdc33f286	tabs added	2018-08-30 10:02:31 +02:00
Frédéric FRANCE	4196febb67	tabs added	2018-08-30 09:40:04 +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	a5a629fd0f	Fix phpcs	2018-08-29 17:44:44 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing Trimtrailing	2018-08-28 02:30:02 +02:00
ksar-ksar	a844855ade	Update hook formConfirm The hook should be called when the $formconfirm is not empty	2018-08-24 16:40:26 +02:00
Philippe GRAND	2fa82edd39	Standardize and update code	2018-08-23 17:07:27 +02:00
Philippe GRAND	449ef9c464	Update and standardize code	2018-08-22 18:12:44 +02:00
Philippe GRAND	95349365ba	Update and standardize code	2018-08-22 11:39:37 +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
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	85eed6cf80	Merge branch 'develop' into trimtrailing	2018-08-21 13:40:04 +02:00
Laurent Destailleur	289f194641	Merge pull request #9058 from defrance/patch-123 New : Add total price on dashboard	2018-08-21 13:33:33 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +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
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
Laurent Destailleur	2f559a7edb	Merge pull request #9199 from atm-quentin/FIX_hook_update_price NEW Add hook changeRoundingMode in update_price	2018-08-12 18:17:52 +02:00
Laurent Destailleur	3d4d42462c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-12 16:30:21 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
Frédéric FRANCE	62b83412ee	test phpcs v3	2018-08-09 11:31:48 +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	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
atm-quentin	6662bf05ba	FIX hook on update price AND fix id on line	2018-08-03 11:47:43 +02:00
Philippe	61e1f0508d	FIX : Search on Ref project on order list	2018-08-03 11:08:09 +02:00
Juanjo Menent	b8efe3b239	Merge pull request #9172 from grandoc/new_branch_28_07_2018 standardize	2018-08-02 11:27:02 +02:00
Philippe GRAND	fb565b15c5	standardize	2018-07-29 19:16:28 +02:00
Frédéric FRANCE	c991a4d204	trim trailing	2018-07-26 18:05:20 +02:00
Frédéric FRANCE	0952cf5e2b	fix no link in order list	2018-07-26 10:43:50 +02:00
Philippe GRAND	2a6f050e32	Clean and update code	2018-07-24 18:28:56 +02:00
Laurent Destailleur	387abf2da8	Merge pull request #9057 from inoveaconseil/checkRightOnLink ADD Check right on link	2018-07-16 09:31:21 +02:00
Laurent Destailleur	f3b7bc53bd	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/tpl/extrafields_list_print_fields.tpl.php	2018-07-15 20:16:08 +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	bda142d82d	Update commande.class.php	2018-07-10 11:10:55 +02:00
BENKE Charlene	5a6cfd5efe	Update commande.class.php	2018-07-05 12:08:59 +02:00
Inovea Conseil	30cff2bb36	ADD check user's rights	2018-07-05 11:52:41 +02:00
Laurent Destailleur	cfb41d4329	FIX: If module workflow disabled, we must disable autoclassification too	2018-07-03 11:43:50 +02:00
Regis Houssin	26495fb698	Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!!	2018-07-01 18:49:37 +02:00
Regis Houssin	4925624ed9	Fix: avoid NULL value when "subprice" is 0	2018-06-30 10:38:30 +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	3ea2d81279	FIX combo into popup become crazy with IE10	2018-06-28 12:05:02 +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	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	edd7499375	Fix clone with new architecture	2018-06-19 09:21:23 +02:00
Inovea Conseil	d5a3e63e05	Fix missing paramater for generateDocument	2018-06-15 09:47:28 +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
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
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	323bf6ef1f	Merge pull request #8873 from frederic34/loadlangs loadlangs	2018-05-29 10:07:10 +02:00
Laurent Destailleur	f83dedf1b0	Fix space/tab	2018-05-29 10:04:20 +02:00
Neil Orley	748be12da2	Get external contacts ids instead of BILLING contacts ids.	2018-05-28 09:42:24 +02:00
Neil Orley	4ad1f81ea9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2018-05-28 09:30:21 +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	30a3b95368	loadlangs	2018-05-26 20:32:23 +02:00
Frédéric FRANCE	f53f7bbf40	loadlangs	2018-05-26 18:41:16 +02:00
Frédéric FRANCE	0a90f2d690	loadlangs	2018-05-26 15:50:03 +02:00
Frédéric FRANCE	091fb81368	Update list.php	2018-05-26 09:49:13 +02:00
Laurent Destailleur	182abfdb5b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/societe/card.php	2018-05-25 15:02:24 +02:00
Laurent Destailleur	8a64ee2297	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/commande/list.php htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/expedition/class/expedition.class.php htdocs/expedition/list.php htdocs/societe/card.php	2018-05-25 13:14:58 +02:00
Laurent Destailleur	823936ef87	Merge pull request #8847 from frederic34/multipriceqty NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-25 12:55:02 +02:00
Philippe GRAND	11b63325bf	clean and update code	2018-05-24 10:48:03 +02:00
atm-quentin	eb224e43a5	FIX missing filters during ordering	2018-05-24 10:41:24 +02:00
Frédéric FRANCE	8547827575	Merge remote-tracking branch 'upstream/develop' into multipriceqty	2018-05-23 17:06:02 +02:00
Frédéric FRANCE	efbb053e54	PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-23 17:05:08 +02:00
Neil Orley	15e02c7082	NEW : adds billing contacts ids to REST API returns adds billing contacts ids to REST API returns for proposals, orders and invoices	2018-05-22 11:40:32 +02:00
Laurent Destailleur	de84f0e687	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/actions_massactions.inc.php htdocs/filefunc.inc.php	2018-05-21 23:35:09 +02:00
Laurent Destailleur	6d0306f75a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/class/html.formfile.class.php	2018-05-18 11:52:48 +02:00
Laurent Destailleur	492b1e7169	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-05-18 11:48:08 +02:00
Juanjo Menent	dc7a1610e7	Fix: extrafiels is not passing orders to invoice	2018-05-17 18:56:01 +02:00
atm-quentin	8cd6c72a2f	NEW advanced rights	2018-05-07 10:04:43 +02:00
Laurent Destailleur	7511ba52ae	NEW Suggest link to pay online for customer orders	2018-05-05 22:20:33 +02:00
Laurent Destailleur	546da0ceda	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php	2018-05-05 14:40:39 +02:00
Laurent Destailleur	86697c58d8	Merge pull request #8712 from atm-quentin/develop_categ_filter NEW thirdparty categ filter on lists	2018-05-05 12:56:27 +02:00
atm-quentin	ec5e84075e	NEW Rights to ignore price min	2018-05-03 10:18:38 +02:00
atm-quentin	21b387a4c4	NEW thirdparty categ filter on lists	2018-05-02 15:01:32 +02:00
atm-quentin	a20ec7ba1e	NEW cancel orders on massaction	2018-05-02 14:37:35 +02:00
Laurent Destailleur	3340598cf8	FIX Projet is not prefilled when created from overwiew page	2018-05-01 14:15:11 +02:00
Laurent Destailleur	3374c50e2d	CSS	2018-05-01 10:42:09 +02:00
Laurent Destailleur	82a8513aed	Standardize code	2018-04-29 19:52:14 +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
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	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37: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
All-3kcis	880fa55dd5	display user-friendly filesize	2018-04-12 15:29:22 +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	2d547abaa9	Merge pull request #8498 from atm-john/New_import_lines_from_linked_element New import lines from linked element	2018-04-05 18:26:47 +02:00
John	57db0d2a16	Add hidden conf	2018-04-05 17:26:08 +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
John	d689e88b92	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-04-03 11:38:12 +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	72cedcf9f3	Removed method fetch_prods() and get_each_prod() not used, keep only get_arbo_each_prod() that is better.	2018-03-22 18:01:06 +01:00
Laurent Destailleur	3b55049895	Dolibarrize module ticket	2018-03-22 10:23:25 +01:00
Laurent Destailleur	f46df6d8e5	Can resize and crop images in the ticketsup module	2018-03-19 11:49:05 +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	e639f2a91f	Removed deprecated method classer_facturee(). Duplicate of classifyBilled	2018-03-16 10:51:12 +01:00
Laurent Destailleur	0258d3aeeb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-13 18:04:59 +01:00
Laurent Destailleur	ca809a11af	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/commande/class/commande.class.php	2018-03-13 18:04:18 +01:00
Laurent Destailleur	dcd3387a30	Update commande.class.php	2018-03-13 09:53:21 +01:00
Laurent Destailleur	51229a602f	Update commande.class.php	2018-03-13 09:51:45 +01:00
atm-quentin	6c7a5cebdf	FIX check verif exped on delete order	2018-03-13 09:34:50 +01:00
Alexandre SPANGARO	c0d4ca3682	Fix : Remove two langs->load("sendings") and use loadLangs instead	2018-03-11 22:28:27 +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
Romain DELVAL	ee55776886	FIX Duplicate product_type asignement on order addline On addline order method, ther is a duplicate assignation on line->product_type before call to "insert" method. The second assignement always make product_type to "0" while it was fetched from product himsel like it was made on first asignement few lines above	2018-03-09 12:38:28 +01:00
Regis Houssin	ea175cd6c1	Fix: compatibility with multicompany dictionnary sharing	2018-03-09 09:37:23 +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
Regis Houssin	93a9430e49	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
Laurent Destailleur	317a5f5b2f	Fix by adding a redirect to avoid the order2billing being done twice.	2018-03-07 19:15:23 +01:00
Laurent Destailleur	64b0d1d390	Fix by adding a redirect to avoid the order2billing being done twice.	2018-03-07 14:33:29 +01:00
Laurent Destailleur	004839b368	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-07 13:03:40 +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	451d943927	NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)	2018-03-02 16:48:25 +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
ATM-Nicolas	a4ae700202	FIX : Avoid empty value to fk_multicurrency attribute	2018-02-27 11:11:32 +01:00
ATM-Nicolas	27100df927	FIX : Avoid empty value to fk_multicurrency attribute	2018-02-27 11:06:11 +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	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +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
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
John	a7a6630fad	Add popin dialog	2018-02-22 15:19:20 +01:00
John	f313fb925b	Add new checkbox for lines	2018-02-21 17:06:40 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
John	bd0e8506f5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-02-21 11:53:16 +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
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
John	09c5dc506a	Add html dom element and fix class	2018-02-20 17:46:32 +01:00
John	5624257a6d	add new dom html5 elements and class	2018-02-20 16:49:49 +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	905adab517	NEW: supplier credit notes: display supplier discounts in supplier order card	2018-02-16 11:23:59 +01:00
Laurent Destailleur	475b89bac1	Merge branch 'develop' into new_order_min_amount	2018-02-08 14:20:53 +01:00
Laurent Destailleur	0cc6654b06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php	2018-02-04 13:25:00 +01:00
Laurent Destailleur	c6fba7273d	Api interventions	2018-02-03 20:58:26 +01:00
Laurent Destailleur	b3df7670e9	Merge pull request #7999 from frederic34/propalweight NEW display weight volume in propal	2018-02-03 16:58:58 +01:00
Laurent Destailleur	6e446ccaae	Fix scrutinizer	2018-02-01 10:51:01 +01:00
Laurent Destailleur	89dc208072	Fix fk_account not into update	2018-01-30 17:00:17 +01:00
Maxime Kohlhaas	9899a02630	Display alert if order total is under order min amount	2018-01-20 20:17:56 +01:00
Laurent Destailleur	e4c02152b3	Fix navigation in bookeeping view grouped by account	2018-01-15 12:14:18 +01:00
Laurent Destailleur	3bcf1d9da6	Fix css	2018-01-13 12:08:24 +01:00
Laurent Destailleur	43d560830c	Fix on old php	2018-01-10 13:20:43 +01:00
Laurent Destailleur	9f79ad800b	Fix price per quantity	2018-01-09 14:20:47 +01:00
Laurent Destailleur	42e659e26c	Fix link for online payment	2018-01-08 13:21:04 +01:00
Laurent Destailleur	1e438b7ebd	Fix travis and return of api that change status	2018-01-05 02:01:57 +01:00
Laurent Destailleur	0fb95fa15f	Try a fix for #7778	2018-01-05 01:30:12 +01:00
Laurent Destailleur	f19fb90ab0	Merge #8008 manually	2018-01-04 23:36:14 +01:00
Frédéric FRANCE	33f6ba19da	display weight volume in propal	2017-12-28 16:20:08 +01:00
Laurent Destailleur	b0fefffcf8	Fix standardize api code	2017-12-28 12:44:15 +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	aad0da2513	Fix maxi debug of APIs (clean output fields)	2017-12-21 16:50:18 +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	f1305bbdd6	Fix css	2017-12-20 21:14:22 +01:00
Neil Orley	171e388f6d	NEW Update bank account when updating an order Add the ability to update the bankaccount when updating an order	2017-12-19 14:16:51 +01:00
Neil Orley	7e3a2d75bb	FIX Error when classify the order as invoiced unsing API Remove of notrigger parameter. The notrigger attribute caused a type error when used.	2017-12-19 13:06:28 +01:00
Neil Orley	fe8fac9577	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-12-19 12:36:46 +01:00
Neil Orley	0817873267	NEW Create an order using an existing proposal Create an order using an existing proposal.	2017-12-18 16:13:54 +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
Neil Orley	5ae74f8ae1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-12-15 09:56:02 +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
Laurent Destailleur	bb7c03906e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/files.lib.php htdocs/societe/list.php	2017-12-11 15:25:09 +01:00
Laurent Destailleur	95cb5025a2	Fix length of month too large More complete template	2017-12-08 16:15:41 +01:00
Laurent Destailleur	09d3db145b	Merge	2017-12-08 13:10:13 +01:00
Regis Houssin	1b16eb731d	Fix: missing load product translation file	2017-12-08 11:00:23 +01:00
Regis Houssin	1bdffa961f	Fix: wrong translation if multilang activated	2017-12-08 10:41:14 +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	ce32da6217	Fix debugs APIs	2017-12-01 15:39:18 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
Laurent Destailleur	77509ee37a	Removed deprecated apis	2017-11-25 13:14:28 +01:00
Laurent Destailleur	a5dda258cd	Fix scrutinizer	2017-11-25 12:18:23 +01:00
Laurent Destailleur	9f235e1ff6	Standardize database: field ref of warehouse was renamed label -> ref	2017-11-24 15:27:00 +01:00
Laurent Destailleur	9c22b5f335	Replace deprecated dol_print_graph with DolGraph	2017-11-23 20:24:05 +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	80bdb45be8	Look and feel v6 - Show status of thirdparty in dol_banner	2017-11-18 01:48:16 +01:00
Laurent Destailleur	0d192df1fd	Standardize interface	2017-11-16 18:33:56 +01:00
Neil Orley	d97cf63a16	NEW Classify the order as invoiced in the REST API Classify the order as invoiced FIX variable name	2017-11-15 12:14:28 +01:00
Laurent Destailleur	f68b2bdeca	Use the confirmation when deleting from mass action everywhere.	2017-11-15 11:39:11 +01:00
Neil Orley	42d1072dee	NEW Tag the order as validated (opened) in the REST API Tag the order as validated (opened)	2017-11-15 10:55:39 +01:00
Laurent Destailleur	c85acbfc11	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/commonobject.class.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/install/repair.php	2017-11-14 19:47:33 +01:00
Laurent Destailleur	59d9ab731e	Add param $idwarehouse to settodraft	2017-11-14 01:29:28 +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	4212000caf	Update api_orders.class.php	2017-11-14 01:21:06 +01:00
Laurent Destailleur	bf05a0b8e0	Update api_orders.class.php	2017-11-14 01:19:04 +01:00
Neil Orley	d2a67e152b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-11-13 14:39:09 +01:00
Laurent Destailleur	b5196b7164	FIX A lot of several fix on local taxes and NPR tax	2017-11-13 14:24:40 +01:00
Laurent Destailleur	1a5bbef266	FIX Locatax were not propagated when cloning order or proposal	2017-11-13 13:07:31 +01:00
Laurent Destailleur	836f6bf3c9	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
Laurent Destailleur	75e5d80eb6	Better help on mass invoicing from orders	2017-11-11 17:09:15 +01:00
Laurent Destailleur	d1860b87f8	NEW Add a confirmation for all mass action 'delete'	2017-11-11 16:34:11 +01:00
Neil Orley	c68f717071	NEW Update availability Add the ability to update availability while updating an invoice using the REST API	2017-11-10 16:22:20 +01:00
Neil Orley	182fe4a90f	Change HTTP response code when nothing modified	2017-11-10 15:48:43 +01:00
Neil Orley	73fe991aed	NEW Return the order object when validate Return the order object when the order is validated using the REST API	2017-11-10 15:46:53 +01:00
Laurent Destailleur	bc093ef969	FIX #7775 Order of deletion in delete method (trigger first)	2017-11-06 19:27:10 +01:00
Laurent Destailleur	ea5dd3eb3d	NEW Add REST API for supplier proposals	2017-11-06 11:06:31 +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	bac6a434f4	Add link to make a direct download on card	2017-11-04 17:11:58 +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	cfacfab6cf	NEW Show badge with nbr of shipment on shimpen tab of order NEW Add button cancel on shipment creation	2017-11-02 12:38:36 +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	9283aaf6aa	Fix scrutinizer	2017-10-27 00:07:58 +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
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	f24204c79a	Error management after extrafield update	2017-10-24 19:04:40 +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	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
Laurent Destailleur	f7556e7ad2	FIX make of link to other object during creation	2017-10-19 19:06:48 +02:00
TuxGasy	9c3805c0d5	Fix anchor after add line	2017-10-19 14:10:58 +02:00
Laurent Destailleur	93d16bf4d7	Fix several fixes in APIs	2017-10-19 12:30:36 +02:00
Laurent Destailleur	9c45e86a1c	Introduce main_doc into table of objects to know what is main doc. Work on option PROPOSAL_USE_ONLINE_SIGN	2017-10-19 11:40:40 +02:00
Laurent Destailleur	7f85d73001	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/card.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contrat/card.php htdocs/expensereport/card.php htdocs/fichinter/list.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php htdocs/fourn/paiement/card.php htdocs/livraison/card.php htdocs/modulebuilder/template/myobject_list.php htdocs/societe/rib.php htdocs/supplier_proposal/list.php htdocs/user/card.php	2017-10-18 19:51:29 +02:00
Laurent Destailleur	8626d6279a	Fix perm to delete files	2017-10-18 17:21:30 +02:00
Laurent Destailleur	34e09315cc	Code comment	2017-10-18 15:35:51 +02:00
Laurent Destailleur	99239cbb38	Add API close to close an order	2017-10-18 15:34:03 +02:00
Laurent Destailleur	d40dda83cf	Add API "close" for proposals Standardize code	2017-10-18 11:10:08 +02:00
Laurent Destailleur	8b140ab069	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-17 10:44:29 +02:00
Laurent Destailleur	eb1fdca157	NEW Can create intervention from a proposal	2017-10-17 10:44:18 +02:00
Laurent Destailleur	ebe0664aff	Merge branch 'develop' into scrutinizer-patch-3	2017-10-16 20:54:15 +02:00
Laurent Destailleur	45ac8367bd	NEW Add API for contracts	2017-10-16 17:56:59 +02:00
Scrutinizer Auto-Fixer	bd5bffa72c	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-16 06:47:05 +00:00
Scrutinizer Auto-Fixer	165741517e	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-13 11:28:26 +00:00
Laurent Destailleur	7c9993ef0e	Various fixes	2017-10-13 12:14:57 +02:00
Laurent Destailleur	8c5cf9ea45	Fix date output	2017-10-12 18:04:47 +02:00
Laurent Destailleur	051d49732d	Keep compatiblity of status key	2017-10-11 11:36:24 +02:00
Rui Strecht	666e62b440	Fixed issue with inexistent constant in commande STATUS_ACCEPTED	2017-10-09 17:54:15 +01:00
Laurent Destailleur	af1d2bfffd	Standardize code	2017-10-07 14:11:01 +02:00
Laurent Destailleur	74deb05527	Clean code. Use constant for status of supplier order process.	2017-10-07 13:04:31 +02:00
Laurent Destailleur	d28188d19d	FIX Generation of invoice from bulk action "Bill Orders" Conflicts: htdocs/fourn/class/fournisseur.facture.class.php	2017-10-04 14:31:52 +02:00
Laurent Destailleur	a74d6074a3	FIX Generation of invoice from bulk action "Bill Orders"	2017-10-04 14:27:10 +02:00
Laurent Destailleur	c22cd1cfe9	Fix test on entity must always be done using the "IN" instead of "="	2017-10-03 17:41:22 +02:00
Laurent Destailleur	f2e0ff0d30	Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict	2017-10-03 17:25:01 +02:00
Laurent Destailleur	2f20de2457	Fix cancel button on create	2017-10-03 14:57:38 +02:00
Regis Houssin	09e71f1390	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-10-02 11:51:27 +02:00
Laurent Destailleur	f007f9e7e5	NEW Add new property visible dy default on lists on extrafields	2017-09-29 13:26:44 +02:00
Regis Houssin	9823d6622c	Fix: use default $shared value	2017-09-27 17:40:02 +02:00
Regis Houssin	20684b4505	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/modules/rapport/pdf_paiement.class.php htdocs/core/modules/rapport/pdf_paiement_fourn.class.php	2017-09-27 17:22:18 +02:00
Laurent Destailleur	c9e9f60f8f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-09-25 19:55:52 +02:00
Laurent Destailleur	c5287e68b1	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/admin/multicurrency.php htdocs/core/modules/modFournisseur.class.php	2017-09-25 19:54:27 +02:00
Regis Houssin	d592664150	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-09-25 06:48:26 +02:00
Laurent Destailleur	e3da4188e2	GETPOST must not clean data for text input.	2017-09-25 00:16:52 +02:00
Laurent Destailleur	f990667b1a	NEW Can send email from the member card using email templates.	2017-09-22 17:48:38 +02:00
TuxGasy	4043141ae3	Allow create shipping if STOCK_SUPPORTS_SERVICES option is enabled	2017-09-18 14:11:21 +02:00
Regis Houssin	a03ef95eaa	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/tables/llx_c_payment_term.sql	2017-09-18 09:11:04 +02:00
Laurent Destailleur	ab5724e7ff	Mutualize code for forms to send emails. Remove thousand line of code.	2017-09-17 17:12:14 +02:00
Laurent Destailleur	e014ac6ea9	NEW Send by email available in bulk for expense report	2017-09-16 22:03:25 +02:00
Laurent Destailleur	b4eab24490	Add project into list of customer orders	2017-09-16 20:32:28 +02:00
Laurent Destailleur	0fec777d0e	NEW On bulk email from a list, can uncheck "Join main document". NEW Show direct preview link on contract	2017-09-16 18:31:30 +02:00
Laurent Destailleur	630dc92a13	NEW Mass PDF Merging is available on contracts	2017-09-16 15:39:52 +02:00
Regis Houssin	db17eb80ec	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/facture/class/paymentterm.class.php	2017-09-15 16:45:49 +02:00
Laurent Destailleur	5e34b121dd	Add more robust php unit to detect not escaped sql. Fix not escaped sql	2017-09-15 15:41:07 +02:00
Laurent Destailleur	e02c220c08	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-15 11:04:27 +02:00
Laurent Destailleur	cce1549f66	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/commande/card.php htdocs/core/lib/functions.lib.php htdocs/fourn/card.php htdocs/public/members/new.php	2017-09-15 11:02:34 +02:00
Laurent Destailleur	0873260b8a	USe second parameter in GETPOST	2017-09-15 10:50:50 +02:00
Laurent Destailleur	2798726dba	Update card.php	2017-09-14 13:23:28 +02:00
Laurent Destailleur	51d1c35399	Merge pull request #7380 from tysauron/patch-8 $soc->getAvailableDiscounts . where soc not set.	2017-09-14 12:12:20 +02:00
Regis Houssin	a494e01f00	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-14 12:07:19 +02:00
Stéphane BERTHELOT	93defa5f59	Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings)	2017-09-14 12:06:25 +02:00
Laurent Destailleur	165c3ac112	Merge pull request #7374 from EmisFR/develop Fix dates in commande and remisecheque for PostgreSQL	2017-09-14 12:05:51 +02:00
TuxGasy	f0983353f2	Fix #7387 : filter clsed company when create new documents	2017-09-14 12:01:35 +02:00
Laurent Destailleur	149ab80b3a	The event array of an object is visible even if no event yet recorded.	2017-09-13 14:18:36 +02:00
Laurent Destailleur	71ce82b6b9	NEW Better autoselect customer or supplier fields to save clicks	2017-09-12 16:51:10 +02:00
tysauron	afac908fda	$soc->getAvailableDiscounts . where soc not set.	2017-09-12 12:35:06 +02:00
Stéphane BERTHELOT	66f671f4c8	Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings)	2017-09-11 18:01:24 +02:00
Laurent Destailleur	b87ce172c3	FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN	2017-09-11 13:40:34 +02:00
Laurent Destailleur	59ab52c718	FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN	2017-09-11 13:39:03 +02:00
Regis Houssin	b5de8da3a6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/modules/modFacture.class.php	2017-09-11 08:07:55 +02:00
Laurent Destailleur	259cca0230	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php	2017-09-08 13:30:54 +02:00
Laurent Destailleur	03fe9d4e97	Escape all status	2017-09-08 13:23:12 +02:00
Laurent Destailleur	bde293af22	Fix filter on extrafield with type sellist	2017-09-07 15:34:25 +02:00
Regis Houssin	66e548427c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/resultat/clientfourn.php htdocs/core/lib/functions.lib.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-07 10:50:35 +02:00
Laurent Destailleur	4b9f54e571	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/data/llx_accounting.sql htdocs/install/mysql/migration/5.0.0-6.0.0.sql htdocs/install/mysql/tables/llx_holiday_config.sql	2017-09-01 17:34:57 +02:00
Regis Houssin	8e8f94df11	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/facture/card.php htdocs/compta/facture/class/facture-rec.class.php	2017-08-30 19:33:23 +02:00
Laurent Destailleur	d3c95e030b	Fix delete file not possible for external user even with permissions	2017-08-30 14:34:36 +02:00
Laurent Destailleur	7aa09d8b71	NEW Can create thirdparty from card proposal, order or invoice	2017-08-28 18:37:16 +02:00
Regis Houssin	2f537a1ade	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/charges/index.php htdocs/compta/paiement/list.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-22 18:49:40 +02:00
Laurent Destailleur	81b11100b0	Prepare code to clone site an fetch external page	2017-08-03 01:45:31 +02:00
Laurent Destailleur	5b1f5b0f20	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
Regis Houssin	0dc0fe81fc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-31 07:40:01 +02:00
Laurent Destailleur	60493d0a47	Several fixes (permission, missing method or class) in REST APIs	2017-07-28 11:03:30 +02:00
Regis Houssin	acd5780e32	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-26 08:58:56 +02:00
Laurent Destailleur	cba898e2b9	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/compta/facture.php	2017-07-25 10:12:28 +02:00
Laurent Destailleur	aa9b4ce1f3	Fix too long combo for tags	2017-07-25 09:49:08 +02:00
Laurent Destailleur	25b107defb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/contrat/list.php htdocs/fichinter/list.php	2017-07-23 19:09:00 +02:00
Regis Houssin	26df1389f4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-07-21 20:42:21 +02:00
Laurent Destailleur	d07741ada1	Merge branch 'develop' into patch-rib	2017-07-21 14:58:33 +02:00
Regis Houssin	c8bd11660d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-18 15:23:43 +02:00
Laurent Destailleur	98cb1b7af1	Merge pull request #7171 from atm-ph/fix_5.0_search_lost Fix lost search value in list if come from thirdparty card	2017-07-18 14:48:38 +02:00
Laurent Destailleur	b2c00ac463	Merge pull request #7161 from hguibourgdev/patch-4 Patch 4	2017-07-18 14:38:34 +02:00
phf	885fc3c5b7	Fix lost search value in list if come from thirdparty card	2017-07-17 11:04:48 +02:00
Regis Houssin	200f232164	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-16 07:51:20 +02:00
hguibourgdev	2166b3d467	Update card.php FIX "!" is missing on test : empty($object->date_livraison)	2017-07-15 12:04:59 +02:00
Laurent Destailleur	743de4e586	FIX Option to classify proposal/order in workflow module must not set source object to billed if amount differs.	2017-07-13 12:42:32 +02:00
Laurent Destailleur	0b4a1d9b65	Protection to avoid mass action execution when not required	2017-07-13 02:49:40 +02:00
Laurent Destailleur	9127892c71	Fix several minor bugs	2017-07-13 02:33:48 +02:00
Laurent Destailleur	2870798d07	Fix remove warnings	2017-07-13 00:35:10 +02:00
Regis Houssin	cb6b81d897	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-11 19:10:22 +02:00
Laurent Destailleur	8a9c38114f	Fix bug reported by scrutinizer	2017-07-08 19:05:51 +02:00
Laurent Destailleur	f40afcf023	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/facture/list.php htdocs/compta/paiement/class/cpaiement.class.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php htdocs/product/stats/facture.php	2017-07-08 18:32:34 +02:00
Laurent Destailleur	ba3b6b6aa5	Better support of vat with code in expense report	2017-07-08 18:09:45 +02:00
Laurent Destailleur	34d0c79e32	Merge pull request #7124 from fappels/develop_updateline_notriggerflag New add trigger disable to updateline functions	2017-07-07 20:30:04 +02:00
Laurent Destailleur	47c6a324ac	Merge pull request #7086 from OPEN-DSI/core_commande_warning_delay_dashboard FIX: Function load_board in commande.class.php for warnings delay in dashboard	2017-07-07 18:56:31 +02:00
Laurent Destailleur	252d8da8fc	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/commondocgenerator.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2017-07-07 15:11:53 +02:00
fappels	6effcb0829	New add trigger disable to updateline functions	2017-07-06 16:26:15 +02:00
Regis Houssin	3f882cb33a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-03 09:24:05 +02:00
Laurent Destailleur	7ae52d843c	Look and feel v6	2017-07-01 14:23:24 +02:00
Laurent Destailleur	d55213286e	Fix missing parameter	2017-06-30 11:40:26 +02:00
KHELIFA	7dc4eeddf0	FIX: Function load_board in commande.class.php for warnings delay in dashboard	2017-06-29 16:44:52 +02:00
Regis Houssin	fa247ffd98	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-29 08:51:42 +02:00
Laurent Destailleur	6f82837b0f	Fix GETPOST of lang_id	2017-06-27 17:27:01 +02:00
Laurent Destailleur	4102403482	Look and feel v6	2017-06-21 11:37:34 +02:00
Regis Houssin	2fffd2fa6f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-20 23:26:21 +02:00
Laurent Destailleur	08a86fa03d	Start #6981	2017-06-20 12:17:13 +02:00
Regis Houssin	909826e24f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-20 06:25:35 +02:00
Laurent Destailleur	bb2d27280b	Fix sort link must be disabled for computed field	2017-06-19 14:31:08 +02:00
Regis Houssin	a0299042e4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-17 12:05:33 +02:00
Laurent Destailleur	5b7a8e9c90	Fix missing signature when sending email from user card	2017-06-17 10:17:36 +02:00
Regis Houssin	cd095e99c9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-14 12:16:10 +02:00
Laurent Destailleur	1b56e4a01c	Fix look and feel v6	2017-06-14 11:28:42 +02:00
Regis Houssin	d1233755f6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-11 11:41:02 +02:00
Laurent Destailleur	a96362e2f9	Fix #formmailbeforetitle not supported everywhere	2017-06-11 11:40:01 +02:00
Regis Houssin	cc75916599	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-11 11:26:24 +02:00
Laurent Destailleur	e93cefbbf0	FIX #6985	2017-06-11 10:37:58 +02:00
Regis Houssin	3445c9d329	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/lib/functions.lib.php	2017-06-11 06:27:49 +02:00
Laurent Destailleur	7c0de18ac1	Fix code comment	2017-06-10 12:56:28 +02:00
Laurent Destailleur	3347316d3c	Fix delete of member	2017-06-09 17:02:05 +02:00
Regis Houssin	58b3d86b49	Fix: errors	2017-06-09 09:40:43 +02:00
Regis Houssin	fa58f0f3e8	Fix: add entity filter	2017-06-09 09:25:15 +02:00
Laurent Destailleur	b441c62e1d	Fix syntax error	2017-06-08 14:55:12 +02:00
Laurent Destailleur	b1f93ccb0c	Fix security	2017-06-08 14:33:46 +02:00
Regis Houssin	2b36135641	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-07 20:14:03 +02:00
Laurent Destailleur	1820649175	Maxi debug of v6	2017-06-07 19:28:31 +02:00
Regis Houssin	bfd6116e5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-06 15:03:36 +02:00
Laurent Destailleur	02b5d9e6f7	FIX #6945	2017-06-06 10:53:53 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	f5e29d6c86	Fix phpcs warning	2017-05-22 10:45:02 +02:00
Laurent Destailleur	b3dc73e611	Look and feel v6	2017-05-21 02:43:51 +02:00
Laurent Destailleur	2021758403	Merge pull request #6834 from atm-ph/fix_fk_project_on_create_order_from_propal Fix fk project on create order from propal	2017-05-20 12:13:42 +02:00
Laurent Destailleur	470165615f	Fix look and feel v6	2017-05-19 16:32:23 +02:00
Laurent Destailleur	aec4cef5de	Clean some code for type of event deprecated since 3.3	2017-05-19 12:58:38 +02:00
Laurent Destailleur	7dbe3b1da9	Merge pull request #6843 from aspangaro/6.0-multijournal Fix : Sql error on salaries index for accountancy multijournal + debug	2017-05-18 17:45:21 +02:00
Laurent Destailleur	ff5d682d49	Fix css	2017-05-18 03:12:29 +02:00
Laurent Destailleur	b0f0285137	Standardize code	2017-05-16 21:29:18 +02:00
Laurent Destailleur	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +02:00
phf	4d9016c49f	Fix create propal form from propal with project id, fk_project is not used to init select project	2017-05-15 10:12:58 +02:00
Alexandre SPANGARO	93554b7e30	Typo searchpicto	2017-05-14 21:06:33 +02:00
Laurent Destailleur	b568877f22	Merge pull request #6829 from grandoc/new_branch_10_05 Update code using new css class	2017-05-13 19:47:27 +02:00
Laurent Destailleur	553f5b990c	Fix scrutinizer errors	2017-05-13 18:50:55 +02:00
Laurent Destailleur	0d11fce834	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-12 15:45:30 +02:00
Laurent Destailleur	b81de35703	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/adherents/class/adherent.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/facture.class.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/contrat/class/contrat.class.php	2017-05-12 15:44:09 +02:00
Laurent Destailleur	419c15ee8e	Fix escaping class	2017-05-12 15:28:10 +02:00
Laurent Destailleur	30cf3f2bda	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/class/account.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/install/mysql/tables/llx_bank_account.sql	2017-05-11 00:03:06 +02:00
Laurent Destailleur	922fa088b4	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/commande/class/commande.class.php htdocs/core/boxes/box_services_expired.php	2017-05-10 23:47:33 +02:00
Laurent Destailleur	b2e9d4cc21	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-05-10 23:42:49 +02:00
philippe grand	b7b16dc632	Update code using new css class	2017-05-10 16:41:19 +02:00
Laurent Destailleur	5e54567558	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/skeleton_list.php	2017-05-10 13:30:35 +02:00
Laurent Destailleur	3e0fcf5ec2	Fix label "total for this page" on last page.	2017-05-10 11:57:59 +02:00
Laurent Destailleur	e5c898e0d6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog build/makepack-dolibarr.pl htdocs/fichinter/list.php htdocs/product/list.php htdocs/projet/tasks/list.php	2017-05-10 00:48:27 +02:00
Laurent Destailleur	6d01bd712d	FIX Better sanitizing of search all parameter.	2017-05-09 19:36:10 +02:00
Ferran Marcet	dbcb60433b	FIX: Correction with author and validator user on orders	2017-05-09 13:31:20 +02:00
Laurent Destailleur	11b1a2adac	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php	2017-05-05 14:49:25 +02:00
Laurent Dinclaux	24a2fb57ea	Resolved merge conflict	2017-05-05 10:22:46 +11:00
Laurent Dinclaux	909b489d1f	More fixes regarding localtaxes not being diplayed in generated PDF and vat_src_code not being propagating properly when generating posts from type to type.	2017-05-04 10:05:55 +11:00
Laurent Dinclaux	421843e693	Fix missing localtaxes lines in "commande" PDF	2017-05-03 23:35:57 +11:00
Laurent Dinclaux	f63f28c7fe	Fix vat_src_code propagation between post types	2017-05-03 21:37:30 +11:00
Laurent Destailleur	3917bdfc79	Fix vat_src_code propagation.	2017-05-02 22:37:43 +02:00
Laurent Destailleur	865c8140d1	Clean code	2017-04-30 03:23:06 +02:00
Laurent Destailleur	cfde27820e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/translation.php htdocs/comm/card.php htdocs/core/menus/standard/eldy.lib.php	2017-04-27 17:20:40 +02:00
Philippe Grand	c18e7e8816	Merge branch 'develop' into testing	2017-04-19 11:27:36 +02:00
Maxime Kohlhaas	402924f6d7	Fix : no origin on stock mvmt when order set back to draft	2017-04-14 15:12:32 +02:00
Laurent Destailleur	846204bdb4	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	3e9ccc186a	NEW Small PDF template for products	2017-04-13 10:26:12 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
philippe grand	c3387cb4e6	ref column was missing for specimen and some update	2017-04-11 14:54:34 +02:00
Laurent Destailleur	b054ca8267	NEW Introduce mass action on product list ('delete' for the moment)	2017-04-09 15:02:55 +02:00
Laurent Destailleur	0a47245ba5	NEW Add mass actions (pdf merge and delete) for interventions	2017-04-09 14:31:56 +02:00
Laurent Destailleur	52c86cb3f5	NEW Bulk actions available on supplier orders	2017-04-09 13:12:25 +02:00
Laurent Destailleur	be439f6252	Work on look and feel v6	2017-04-07 16:16:44 +02:00
Laurent Destailleur	60a54041c2	NEW Enable bulk actions delete on supplier invoices	2017-04-07 14:09:19 +02:00
Laurent Destailleur	d99b0461c7	Extrafields multilanguage support.	2017-04-03 10:56:28 +02:00
Laurent Destailleur	93687997c9	Work on 6.0 look and feel	2017-03-31 18:40:53 +02:00
Laurent Destailleur	54b03a3552	Work on 6.0 new look and feel	2017-03-29 11:03:13 +02:00
Laurent Destailleur	41063e7cf2	Fix: trigger for delete must be before delete of element	2017-03-28 12:55:20 +02:00
Laurent Destailleur	3740137e31	Add tooltip on label of each open item.	2017-03-28 10:44:52 +02:00
Laurent Destailleur	f843f8a93d	Start to move search bar before table titles	2017-03-27 00:48:50 +02:00
BENKE Charlie	afefb47598	Update list.php	2017-03-26 01:50:00 +01:00
BENKE Charlie	3aff053828	Update list.php	2017-03-24 23:40:34 +01:00
Laurent Destailleur	38660418b4	Include preview of pdf into dol_banner	2017-03-23 22:27:44 +01:00
Laurent Destailleur	3adb43c6e5	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture.php htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/langs/en_US/bills.lang htdocs/product/class/product.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-23 12:52:19 +01:00
Laurent Destailleur	7df9c25e60	Several fixes on multicurrency	2017-03-23 12:44:20 +01:00
Laurent Destailleur	b9a9997688	Page societe/soc.php and compta/facture.php was renamed into card.php to match page naming conventions.	2017-03-20 21:29:22 +01:00
Laurent Destailleur	4831fb4dcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2017-03-19 11:26:49 +01:00
Juanjo Menent	5c028b30d5	Fix #6512 Bug: Invalid argument in when submitting orderstoinvoice.php-form	2017-03-17 17:05:59 +01:00
Laurent Destailleur	68e50d0c79	FIX Filter on date lost after submit on time spent page	2017-03-16 10:36:17 +01:00
Laurent Destailleur	184d52525a	PHP code to manage pair/impair is replaced by native CSS.	2017-03-07 22:45:22 +01:00
Laurent Destailleur	5f79b2d0c6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-03-05 22:11:35 +01:00
Laurent Destailleur	6e2aaf7408	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/commande/list.php	2017-03-05 22:03:38 +01:00
Laurent Destailleur	ee25a412dd	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/commande/list.php	2017-03-05 22:02:16 +01:00
Laurent Destailleur	f67c967d0b	FIX The vat rate line used when adding a predefined product was wrong if there is several vat line with same rate.	2017-03-04 22:27:44 +01:00
Laurent Destailleur	07c828d38f	Introduce method loadLangs to save code lines	2017-03-03 13:27:51 +01:00
gauthier	9cd807af1a	FIX : param billed when we change page	2017-02-28 12:31:45 +01:00
Laurent Destailleur	19e60f03b9	Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms	2017-02-21 14:17:44 +01:00
Laurent Destailleur	c3d78bf1b4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/tools/update.php	2017-02-16 22:09:37 +01:00
Laurent Destailleur	1a3b9fada5	Som fixes on generator of samples	2017-02-16 01:50:02 +01:00
Laurent Destailleur	e1a6e6e4ab	Rename "attributes" into "variants" to avoid confusion with extrafields	2017-02-08 12:37:38 +01:00
Laurent Destailleur	b24f244f67	Merge pull request #5533 from marcosgdf/prod-attr Feature Request: NEW Added product attributes feature	2017-02-08 11:20:33 +01:00
Marcos García de La Fuente	2dfced366e	NEW #2763 Go to document block after clicking in Generate document button Close #2763	2017-02-03 20:11:06 +01:00
Marcos García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
Laurent Destailleur	13f37b2cb9	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-02 02:25:49 +01:00
Laurent Destailleur	f6144b9ecb	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-02 02:24:57 +01:00
Maxime Kohlhaas	7b6488b1c7	Fix numbering was disaplying technical error instead of error message	2017-01-27 10:05:57 +01:00
Laurent Destailleur	c48400331f	Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date NEW get multicurrency rate from document date (propal, order)	2017-01-27 01:32:52 +01:00
Laurent Destailleur	5fd8b1efcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 21:23:35 +01:00
Laurent Destailleur	f875597c0b	Fix statistics of leave requests (date valid not defined if status is draft)	2017-01-22 16:03:08 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Laurent Destailleur	412be59f78	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-01-20 12:09:39 +01:00
Laurent Destailleur	d48f2507b5	Fix link attachment on bank document page	2017-01-18 15:37:45 +01:00
Marcos García de La Fuente	e0cbcadd98	In case Model for document generation is not defined, the criteria to select the model is now: 1. Model for the object 2. Custom default module 3. Hardcoded default module	2017-01-16 21:16:05 +01:00
Laurent Destailleur	4ecd657f34	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 00:02:43 +01:00
Laurent Destailleur	d14e4dbaba	Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on	2017-01-15 20:49:20 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Laurent Destailleur	2c6672d17a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/login.tpl.php	2017-01-12 11:32:51 +01:00
Laurent Destailleur	c42b48636a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/commande/class/api_commande.class.php htdocs/core/class/CMailFile.class.php htdocs/societe/class/api_contact.class.php	2017-01-12 11:06:24 +01:00
KiteAtao	5c76229cdf	Fix Commands Api for REST WebServices	2017-01-07 21:46:49 +01:00
Laurent Destailleur	e9853f3cd7	Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into Franck-MOREAU-develop Conflicts: htdocs/core/lib/functions.lib.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql htdocs/loan/card.php htdocs/loan/class/loan.class.php htdocs/projet/element.php	2017-01-07 17:45:05 +01:00
Laurent Destailleur	fd09a3d35e	Fix link to notes and download pdf not visible on list of expense report	2017-01-02 13:51:05 +01:00
Laurent Destailleur	b642a3a602	Prepare release 5.0	2016-12-31 16:35:56 +01:00
Marcos García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00
Laurent Destailleur	b777ec79f2	Fix contextpage implementation into skeleton	2016-12-23 10:38:27 +01:00
Laurent Destailleur	9e44eb0d15	Fix return code REST similar for all api with POST	2016-12-23 02:08:22 +01:00
Laurent Destailleur	2fd3aa54f5	Merge pull request #6173 from defrance/patch-62 Cleaning code	2016-12-18 11:17:22 +01:00
Laurent Destailleur	12e919b99d	Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin Fix user right write margin	2016-12-18 10:53:34 +01:00
Laurent Destailleur	60b8582aa9	Fix more then 30 security defects	2016-12-18 01:44:26 +01:00
phf	cca7967144	Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin	2016-12-15 16:19:54 +01:00
BENKE Charlie	8b4aa701d7	Update note.php	2016-12-15 15:04:59 +01:00
BENKE Charlie	6766c33110	Update info.php	2016-12-15 15:02:45 +01:00
phf	21a648a052	Fix user right on margin module to write buyprice	2016-12-15 12:01:46 +01:00
phf	f5bffeb535	New get multicurrency rate from document date (propal, order)	2016-12-11 16:30:01 +01:00
Juanjo Menent	1c71eed703	Very best fix of cancel edit line	2016-12-11 15:37:29 +01:00
Juanjo Menent	7915021495	Best fix of cancel edit line	2016-12-11 15:23:07 +01:00
Juanjo Menent	c62a2fb97e	Best fix of cancel edit line	2016-12-11 15:21:06 +01:00
Juanjo Menent	5233c65aba	Merge pull request #6152 from jpfox/develop FIX cancelling order line modification returned to list instead of card	2016-12-11 15:00:37 +01:00
Jean-Pierre Morfin	4a39c79d56	FIX cancelling order line modification returned to list instead of card	2016-12-11 14:32:27 +01:00
Maxime Kohlhaas	df019b255f	Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug # Conflicts: # htdocs/commande/class/commande.class.php	2016-12-11 13:48:24 +01:00
Laurent Destailleur	74c463fd21	Fix phpcs	2016-12-11 13:31:15 +01:00
Laurent Destailleur	2dcb97e61d	Continue work on dol_banner	2016-12-11 13:16:21 +01:00
Maxime Kohlhaas	0302e8c1f8	Missing comment	2016-12-11 09:29:20 +01:00
Maxime Kohlhaas	177ec97689	Actualize currency on propal, order and invoice	2016-12-11 01:04:58 +01:00
Maxime Kohlhaas	d426ab04f0	Multicurrency on proposal and order	2016-12-11 00:42:52 +01:00
Laurent Destailleur	d5e417010f	Complete work on dol_banner	2016-12-09 11:16:04 +01:00
Laurent Destailleur	1838670e31	Fix several security holes on api when used by external users	2016-12-07 19:02:39 +01:00
Laurent Destailleur	2a8f23e8c5	Fix labels	2016-12-06 15:03:39 +01:00
Laurent Destailleur	db9af0118c	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modAdherent.class.php	2016-12-06 14:08:43 +01:00
Laurent Destailleur	761a795294	Maxi debug on REST APIs	2016-12-05 13:31:29 +01:00
Laurent Destailleur	2b8fbf200a	Complete work on the new dol_banner	2016-12-03 21:29:49 +01:00
Laurent Destailleur	6e5a8b6787	FIX Some statistics not compatible with multicompany module.	2016-12-03 19:14:16 +01:00
Laurent Destailleur	bd8f923cee	Several fixes in filter on lists	2016-11-29 22:52:16 +01:00
Laurent Destailleur	e59edca855	Fix Responsive design	2016-11-27 20:55:59 +01:00
Marcos García de La Fuente	cf0ee36150	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-27 18:10:01 +01:00
Laurent Destailleur	017b18d5c6	Fix #6037 #6041	2016-11-27 16:09:16 +01:00
Laurent Destailleur	e4a8342aef	Fix div-table-form balance on all lists (solve responsive design)	2016-11-27 11:41:10 +01:00
Laurent Destailleur	5acd09b2d5	Fix require_once instead of require.	2016-11-24 17:03:18 +01:00
Laurent Destailleur	c1628be9c0	Code comment to add some explanations	2016-11-23 12:29:42 +01:00
Laurent Destailleur	dd27a52a85	Fix several problems on new REST API on project/tasks	2016-11-19 16:08:27 +01:00
Laurent Destailleur	62e0d4ec3f	FIX Several problems into shipment management with lot enabled	2016-11-14 14:34:15 +01:00
Laurent Destailleur	ecbe719f23	FIX Several problems into shipment management with lot enabled	2016-11-14 13:40:41 +01:00
Laurent Destailleur	35d80aa209	Miscellaneous fixes	2016-11-12 12:40:06 +01:00
Laurent Destailleur	9fd5ddf807	NEW Add REST API for projects	2016-11-09 22:54:51 +01:00
Laurent Destailleur	d1446bb7ef	NEW Show subtotal into list of linked elements	2016-11-08 19:19:30 +01:00
Laurent Destailleur	fcca3d6be1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-11-08 17:21:41 +01:00
Laurent Destailleur	6d70d39bbd	NEW Add type "url" as possible extrafield.	2016-11-08 17:21:26 +01:00
Marcos García de La Fuente	286095f5cd	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-11-06 15:01:40 +01:00
BENKE Charlie	06c6a1107d	same error	2016-11-05 11:00:40 +01:00
Laurent Destailleur	59291be6e0	NEW Can filter on status on objects on the "statistics" page.	2016-11-03 19:50:04 +01:00
Laurent Destailleur	ef03f59e50	Uniformize code	2016-11-02 12:16:46 +01:00
Laurent Destailleur	019125f258	Uniformize code	2016-11-02 10:29:14 +01:00
Laurent Destailleur	e9edbba093	NEW Usage of vat code seems ok everywhere.	2016-10-29 21:02:08 +02:00
Laurent Destailleur	91ee1fae51	Fix feature to jump on a numbered page.	2016-10-29 17:46:11 +02:00
Laurent Destailleur	32b6660f63	Uniformize code	2016-10-29 16:18:39 +02:00
Laurent Destailleur	220d81b350	Fix duplicate tooltips	2016-10-28 17:43:29 +02:00
Laurent Destailleur	6938b05219	Mutualize code to show files generated for mass actions	2016-10-28 12:00:30 +02:00
Laurent Destailleur	54bd355800	Better help	2016-10-27 02:02:40 +02:00
Laurent Destailleur	f67863e1aa	NEW Can use any filter on all REST API to list.	2016-10-25 19:15:47 +02:00
Laurent Destailleur	6ef74b33c9	Uniformize code	2016-10-25 11:09:26 +02:00
Laurent Destailleur	6338b04ac0	Remove call of a deprecated function	2016-10-24 11:27:39 +02:00
Laurent Destailleur	33a7b7037d	Save information of vat code into database	2016-10-24 03:23:40 +02:00
Laurent Destailleur	0b63f89e3a	Merge branch 'NEW_customerorders_to_bill' of https://github.com/atm-gauthier/dolibarr into atm-gauthier-NEW_customerorders_to_bill Conflicts: htdocs/langs/en_US/bills.lang	2016-10-24 00:44:37 +02:00
Laurent Destailleur	24ee2bce14	FIX Can edit the customer ref even if order is not draft.	2016-10-18 12:57:30 +02:00
Laurent Destailleur	dfbca2d0ad	Merge pull request #5868 from olsesacl/#5830 NEW: #5830 Allow Generic E-mail Sender	2016-10-15 02:43:19 +02:00
Laurent Destailleur	d27dea8320	NEW Can rename uploaded or generated files on all "documents" tabs.	2016-10-14 18:09:24 +02:00
Sergio Sanchis Climent	8556dab68e	NEW: #5830	2016-10-13 16:44:17 +02:00
gauthier	5803087d4f	NEW : concat of all invoice pdf if invoice validation	2016-10-07 14:32:27 +02:00
gauthier	23255976ef	FIX : require class discount	2016-10-07 11:21:58 +02:00
gauthier	fbd06e48cd	NEW : classify billed orders and trads	2016-10-07 09:20:34 +02:00
gauthier	cdc62f4054	NEW : bill orders from order list	2016-10-06 17:38:00 +02:00
Laurent Destailleur	e79a84a89b	Uniformize code	2016-10-05 21:49:04 +02:00
Laurent Destailleur	6ac39b97e4	Fix restore list of attached files into action report	2016-10-03 00:38:28 +02:00
Laurent Destailleur	45a808e034	NEW Generation of document is available on member card	2016-10-03 00:08:47 +02:00
Laurent Destailleur	ee252f549a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog dev/skeletons/skeleton_list.php htdocs/accountancy/class/html.formventilation.class.php htdocs/core/lib/cron.lib.php htdocs/core/tpl/admin_extrafields_add.tpl.php	2016-10-01 18:42:50 +02:00
Laurent Destailleur	03c60f1b7d	FIX #5802 Incoterms not set	2016-10-01 13:55:07 +02:00
Laurent Destailleur	2b8255590a	Better error message	2016-09-29 13:55:46 +02:00
florian HENRY	4e5f646a0f	fix travis test	2016-09-26 17:07:45 +02:00
florian HENRY	5a8f0491b3	wotk on declaration method OrderLine	2016-09-26 09:34:51 +02:00
Laurent Destailleur	3cb13e16d1	Merge branch 'rest-api-add-accounts' of https://github.com/EuskalMoneta/dolibarr into EuskalMoneta-rest-api-add-accounts Conflicts: htdocs/api/index.php htdocs/commande/class/api_orders.class.php	2016-09-26 02:28:16 +02:00
Laurent Destailleur	d39d7d92c9	Uniformize code.	2016-09-26 02:13:58 +02:00
Laurent Destailleur	100312aac2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/class/cotisation.class.php	2016-09-26 01:32:50 +02:00
Laurent Destailleur	ea09eb13da	Uniformize code	2016-09-26 00:10:29 +02:00
Laurent Destailleur	34378d8bef	Fix phpcs	2016-09-25 17:48:48 +02:00
Laurent Destailleur	a7db09c020	Fix phpcs	2016-09-24 23:06:09 +02:00
aspangaro	922495d72d	Correct travis & typo "Execuete"	2016-09-24 07:18:38 +02:00
Laurent Destailleur	35dd492d19	NEW Add REST api for commercial proposals	2016-09-22 12:53:44 +02:00
Laurent Destailleur	4f842fd2cb	Uniformize look and feel	2016-09-19 13:57:50 +02:00
Laurent Destailleur	af28a67803	Uniformize look using dol_banner	2016-09-19 10:43:30 +02:00
Laurent Destailleur	2facdda690	Uniformize code	2016-09-12 21:54:45 +02:00
Laurent Destailleur	0ab377440d	Complete param of setValueFrom	2016-09-12 20:16:39 +02:00

... 14 15 16 17 18 ...

3770 Commits