dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	3e1b75e916	Merge pull request #10541 from grandoc/new_branch_10_02_2019 update with html5 compliant code	2019-02-12 13:35:27 +01:00
Dan Rusu	57e2971a22	fix code indent	2019-02-11 19:58:01 +02:00
Dan Rusu	9ce4b91f5d	NEW \| make credit note from invoice inspired from the action of the button "Make credit note" from UI. - load invoice data and lines - check invoice type - calculate totals and create new credit notes - create DiscountAbsolute & commit changes	2019-02-11 09:31:43 +02:00
Dan Rusu	0698ddbd77	Revert "add API method to create credit note from invoice" This reverts commit `288a876491`.	2019-02-11 09:24:16 +02:00
Dan Rusu	288a876491	add API method to create credit note from invoice	2019-02-11 09:14:06 +02:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Philippe GRAND	19885cb465	update with html5 compliant code	2019-02-10 10:23:37 +01:00
Philippe GRAND	673e09d7c2	update with html5 compliant code	2019-02-10 10:21:54 +01:00
Philippe GRAND	508d6345a1	update with html5 compliant code	2019-02-10 10:16:58 +01:00
Philippe GRAND	c071e488cf	update with html5 compliant code	2019-02-10 10:10:41 +01:00
Laurent Destailleur	0e42e8824b	Merge branch 'develop' into new_branch_04_02_2019	2019-02-08 09:42:18 +01:00
Laurent Destailleur	8abebb091c	Var no more used	2019-02-08 09:33:01 +01:00
Laurent Destailleur	24955088de	Merge pull request #10501 from hregis/8.0_mc FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9	2019-02-08 09:31:26 +01:00
gauthier	29e4fce450	FIX : can't add lines on invoices	2019-02-06 12:35:23 +01:00
Regis Houssin	8860eab6b1	FIX wrong merged conflict	2019-02-05 07:40:50 +01:00
Regis Houssin	4a19cba257	FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9	2019-02-05 06:34:05 +01:00
Philippe GRAND	6b9b17f93e	update with html5 compliant code	2019-02-04 13:57:38 +01:00
Philippe GRAND	a14332b2b0	update with html5 compliant code	2019-02-04 13:51:39 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
Laurent Destailleur	9fdba921b4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php	2019-01-30 16:48:33 +01:00
Laurent Destailleur	81ae4c52c5	Merge pull request #10446 from mapiolca/8.0 Fix #10317 et #10318	2019-01-30 16:43:14 +01:00
Laurent Destailleur	e72d6c50e6	Merge pull request #10428 from frederic34/toomanylines PSR2.Files.EndFileNewline.TooMany	2019-01-30 16:17:09 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Pierre Ardoin	30548d977f	Prise en charge des Travaux supplémentaires Corrige la filtration pour permettre l'ajout de ligne lors de la présence de travaux supplémentaires en cours de chantier.	2019-01-29 11:19:11 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
Frédéric FRANCE	77747ac2a3	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-28 16:35:12 +01:00
Laurent Destailleur	0827929ede	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php	2019-01-28 16:29:34 +01:00
Laurent Destailleur	f7bcd1ef6d	Fix trans	2019-01-28 01:35:12 +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	ecc30b8ffe	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php	2019-01-27 18:27:58 +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
Laurent Destailleur	ba87284a90	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-26 14:30:44 +01:00
Laurent Destailleur	a5daa25707	Move common code to get sell price into a method	2019-01-24 19:45:17 +01:00
gauthier	84e1f92acd	FIX : when we add a payment on an invoice which already has payments with credit note or deposit amount, and then we get an excess received, discount amount must be $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;	2019-01-23 15:16:51 +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	8096844062	update with html5 compliant code	2019-01-18 10:10:39 +01:00
Laurent Destailleur	58bda12e22	css	2019-01-17 19:31:01 +01:00
Laurent Destailleur	5130019003	css	2019-01-17 19:27:26 +01:00
Laurent Destailleur	2e55bdf087	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-17 19:11:18 +01:00
Laurent Destailleur	16bb85b7fa	Merge pull request #10348 from a-schild/9.0 Fix for issue #10333 branch 9.0	2019-01-17 18:58:49 +01:00
Laurent Destailleur	3a8afafabd	Merge pull request #10027 from atm-quentin/NEW_manage_multicompany_for_invoice New manage multicompany for invoice	2019-01-16 18:51:01 +01:00
Laurent Destailleur	f8973c9a22	Fix translation Late <> Alert	2019-01-16 17:44:39 +01:00
Laurent Destailleur	e7943ae844	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-16 16:48:52 +01:00
Laurent Destailleur	d3828130ab	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/adherents/class/adherent.class.php	2019-01-16 16:48:21 +01:00
a-schild	7e3bfd332e	Fix for issue #10333 paymentterm.class.php invalid SQL in fetch	2019-01-16 13:07:00 +01:00
a-schild	7df86cb630	Fix for issue #10333 paymentterm.class.php invalid SQL in fetch	2019-01-16 13:06:12 +01:00
a-schild	2f5db98a5c	Fix for issue #10333 paymentterm.class.php invalid SQL in fetch	2019-01-16 13:05:22 +01:00
atm-quentin	013c078c8b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice	2019-01-16 10:52:46 +01:00
atm-quentin	0d384eea00	FIX credit note can have negative value	2019-01-16 09:33:24 +01:00
André Schild	1c0e15192d	Fix for issue #10333 paymentterm.class.php invalid SQL in fetch	2019-01-15 20:43:16 +01:00
Laurent Destailleur	22d4afbb62	Missing trans	2019-01-10 01:54:06 +01:00
Laurent Destailleur	d929d93376	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-08 14:19:35 +01:00
diversity-co-uk	2dc87509ff	Fix Invoice PUT, remove extra parameter The first parameter is expected to be the user. The $id of the invoice is already contained in $this See facture.class.php 1610: function update(User $user, $notrigger=0)	2019-01-08 14:17:33 +01:00
mapiolca	bab82a77b5	Update card.php Permettre d'ajouter des lignes complémentaires en cas de travaux supplémentaires lors des situations de travaux.	2019-01-05 22:42:51 +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
ldestailleur	0353bd5302	FIX sql error when resetting payment mode / term	2018-12-29 07:48:47 +01:00
ldestailleur	2225d0a41e	FIX sql error when resetting payment mode / term	2018-12-28 23:16:44 +01:00
Laurent Destailleur	0f76279a03	FIX Missing token and style	2018-12-27 03:46:14 +01:00
Laurent Destailleur	791b2f485a	FIX Missing token and style	2018-12-27 03:45:30 +01:00
Laurent Destailleur	9b55cc401e	Fix trans	2018-12-22 11:32:27 +01:00
Laurent Destailleur	f55db6dd84	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/resources/dbmodel/dolibarr_schema.mwb	2018-12-15 14:09:16 +01:00
Laurent Destailleur	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	59bc15377d	CSS	2018-12-14 18:58:55 +01:00
Laurent Destailleur	3571eaee3d	Merge branch 'develop' into NEW_change_order_concat_desc	2018-12-14 17:44:08 +01:00
Laurent Destailleur	e7b703f0c0	Merge pull request #10154 from bugness-chl/develop-hookfacturerec NEW Adding hooks to facturerec	2018-12-14 16:11:34 +01:00
Laurent Destailleur	c377350c35	Update facture-rec.class.php	2018-12-14 16:09:12 +01:00
Laurent Destailleur	88a52aa11d	Merge branch 'develop' into develop_mc	2018-12-14 15:58:52 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	83efdee7d3	Merge branch 'develop' into new_mass_generate	2018-12-14 15:44:46 +01:00
Laurent Destailleur	611ccc4a9a	Merge branch 'develop' into fieldlabel	2018-12-14 15:42:01 +01:00
Laurent Destailleur	5dabefe227	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-13 20:49:55 +01:00
Laurent Destailleur	f97b561af0	Merge branch 'develop' into qual_rename_facnumber	2018-12-13 20:24:12 +01:00
Laurent Destailleur	4a61c1b6ed	FIX lang not loaded	2018-12-11 13:25:09 +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
Chl	b67101c77c	corr. #10154	2018-12-03 18:09:25 +01:00
Ferran Marcet	7247b14bd9	FIX Lines are not inserted correctly if VAT have code	2018-12-03 12:28:17 +01:00
Regis Houssin	8953a3ed73	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc Conflicts: ChangeLog	2018-12-03 08:46:03 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
Chl	864ce85341	NEW adding hooks to createRecurringInvoices() For example : send the newly generated invoice by mail. We send the counter and the total so launching some action on the last loop (generated invoice or error) is possible. (bonus: correcting error reporting $this->errors to $this->errors[] )	2018-12-02 01:34:13 +01:00
Chl	95b5d8790d	corr. typo	2018-12-02 01:34:13 +01:00
Chl	6ea0919ebb	facture-rec.class.php: reindent	2018-12-02 01:34:13 +01:00
BENKE Charlene	b104c0889d	Update list.php	2018-12-01 23:44:24 +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
atm-quentin	56d4a8a737	revert some code	2018-11-16 15:16:48 +01:00
atm-quentin	70fdff5c27	revert getNextValue function + createfromclone entity	2018-11-16 11:23:14 +01:00
atm-quentin	c18f486179	set facture to invoice AND check invoicenumber conf	2018-11-16 11:20:03 +01:00
atm-quentin	a8ab666d62	remplacement en masse des $conf->entity par des getEntity('facture')	2018-11-16 11:17:18 +01:00
atm-quentin	8e51204dff	manage invoice with multicompany	2018-11-16 11:14:33 +01:00
Frédéric FRANCE	ce6b7adaa0	Merge remote-tracking branch 'upstream/develop' into actionrefused	2018-11-15 22:15:45 +01:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Regis Houssin	aaa9a4f47c	FIX use getEntity('invoice') instead getEntity('facture')	2018-11-15 17:27:49 +01:00
Regis Houssin	6f90516f57	FIX check write permission for multicurrency	2018-11-15 09:40:08 +01:00
Regis Houssin	976094043b	FIX missing GETPOST('entity')	2018-11-14 17:34:27 +01:00
Regis Houssin	3294fada3d	FIX working on invoice sharing (multicompany)	2018-11-14 14:59:36 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +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	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
Laurent Destailleur	0c7f33e1ba	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-05 09:58:19 +01:00
Laurent Destailleur	2900947019	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-05 09:56:57 +01:00
Laurent Destailleur	e1e0001fda	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-05 09:56:00 +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	0127682996	Merge pull request #9881 from grandoc/8.0 merging and typo	2018-10-30 12:41:56 +01:00
Laurent Destailleur	8fbf5b1f33	FIX deletion on draft is allowed if we are allwoed to create	2018-10-29 18:28:19 +01:00
Laurent Destailleur	0266db7aa8	FIX deletion on draft is allowed if we are allwoed to create	2018-10-29 18:19:40 +01:00
Laurent Destailleur	d02fccd7e4	Fix deletion of draft invoice	2018-10-29 14:56:00 +01:00
Laurent Destailleur	824757bca6	Fix perm to delete	2018-10-29 14:47:33 +01:00
Laurent Destailleur	27d82d0e8e	FIX Delete of draft invoice	2018-10-29 14:41:00 +01:00
Laurent Destailleur	85b8c9f219	FIX Delete of draft invoice	2018-10-29 14:35:42 +01:00
Frédéric FRANCE	42a9abad56	remove fieldlabel and add fieldeditkey	2018-10-27 17:45:29 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Maxime Kohlhaas	1b054f1b36	Fix invoice creation from contract was invoicing closed services #9087	2018-10-27 09:21:49 +02:00
Laurent Destailleur	852b069785	Fix reponsive in stats pages	2018-10-26 15:46:17 +02:00
Philippe GRAND	f450e04856	Merge remote-tracking branch 'upstream/8.0' into 8.0	2018-10-26 15:38:15 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Frédéric FRANCE	5f6cbda5a6	Update facture.class.php	2018-10-20 22:34:00 +02:00
Laurent Destailleur	6a6a8ae14b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:29:22 +02:00
Laurent Destailleur	5a1a5548df	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/discount.class.php htdocs/core/lib/payments.lib.php htdocs/product/index.php htdocs/product/list.php htdocs/societe/class/societe.class.php	2018-10-19 14:27:15 +02:00
Laurent Destailleur	762d82f2fe	Move declaration into common	2018-10-19 13:38:05 +02:00
Laurent Destailleur	cff2b923f9	Merge pull request #9784 from ptibogxiv/patch-80 FIX harmony in date name with API	2018-10-19 13:29:59 +02:00
Laurent Destailleur	05326e271d	FIX Filter on invoice type	2018-10-18 17:15:26 +02:00
gauthier	aea7299970	FIX : use discount with multicurrency	2018-10-17 15:49:08 +02:00
ptibogxiv	a77458cb36	Update facture.class.php	2018-10-17 00:07:21 +02:00
ptibogxiv	3fdf3c95b4	FIX harmony in date name with API	2018-10-17 00:04:44 +02:00
Laurent Destailleur	2c1e8d6535	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php	2018-10-16 18:47:11 +02:00
Laurent Destailleur	5d9b770511	phpcs	2018-10-15 13:32:09 +02:00
Laurent Destailleur	df4b3b09d2	Fix var not defined	2018-10-15 13:30:07 +02:00
Laurent Destailleur	abf8867061	Merge pull request #8207 from atm-john/New_invoice_default_documents NEW hidden option to define an invoice template for each invoice type	2018-10-14 16:36:37 +02:00
Maxime Kohlhaas	9be8c579d0	New massaction to generate PDF	2018-10-14 15:50:55 +02:00
Laurent Destailleur	a2aa491c51	Merge pull request #9728 from atm-john/8.0_Fix_count_error Fix count on no countable object	2018-10-12 17:52:30 +02:00
Laurent Destailleur	1ab6cd4b59	Update card.php	2018-10-12 17:51:32 +02:00
John BOTELLA	92686100b2	Fix count on no countable object	2018-10-11 10:51:54 +02:00
John BOTELLA	ee225a2b8b	FIX situation prev percent	2018-10-11 10:14:22 +02:00
Laurent Destailleur	8f4b74733c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/class/adherent.class.php	2018-10-10 01:51:54 +02:00
Laurent Destailleur	b73a2a24ef	FIX Tooltip on invoice widget	2018-10-10 01:16:53 +02:00
Laurent Destailleur	1d04ce2185	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2018-10-09 17:07:32 +02:00
Laurent Destailleur	01c32525df	Merge	2018-10-09 17:06:08 +02:00
Laurent Destailleur	84605bc59b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-09 16:59:47 +02:00
Philippe GRAND	e9bd1be41b	Standardize and update code	2018-10-09 15:38:42 +02:00
Philippe GRAND	bba6669f03	Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018	2018-10-09 08:47:26 +02:00
Laurent Destailleur	35d5a495de	Save pos_source with id of POS station	2018-10-08 22:51:20 +02:00
Laurent Destailleur	41f2289ffa	Save pos station into invoice	2018-10-08 22:28:30 +02:00
Laurent Destailleur	19cf649b48	Add field to track source module of invoice	2018-10-07 13:59:40 +02:00
Nicolas Aupetit	49693854ce	Typo fix: "eee" in localtax1 display	2018-10-06 13:51:46 +11:00
Philippe GRAND	94df8d297d	Standardize code	2018-10-05 15:44:57 +02:00
Marc de Lima Lucio	82651cd920	FIX: invoice stats: situation invoices were not counted	2018-10-05 12:12:04 +02:00
Laurent Destailleur	17e4af50ec	Merge pull request #9680 from ATM-Nicolas/fix_wrong_variable_name FIX : Wrong variable name	2018-10-04 18:47:08 +02:00
Laurent Destailleur	20f45db6b8	Merge pull request #9677 from grandoc/new_branch_04_10_2018 Standardize and update code	2018-10-04 18:33:24 +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
John BOTELLA	0e310a7ffd	FIX invoice delay on invoice list	2018-10-04 14:11:51 +02:00
John BOTELLA	0b3d09fa64	Fix retained warranty delay on list	2018-10-04 12:01:24 +02:00
John BOTELLA	cf89b850ee	Fix retained warranty delay	2018-10-04 11:37:04 +02:00
John BOTELLA	55e26dc531	FIX invoice has delay	2018-10-04 11:09:16 +02:00
ATM-Nicolas	c048f51562	FIX : Wrong variable name	2018-10-04 09:54:40 +02:00
Philippe GRAND	8bee69277d	Standardize and update code	2018-10-04 09:33:30 +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
John BOTELLA	af66a8971a	NEW Hidden conf INVOICE_USE_DEFAULT_DOCUMENT	2018-10-02 15:51:17 +02:00
John BOTELLA	30d62e9fc5	fix retained warranty amount	2018-10-01 15:19:35 +02:00
Laurent Destailleur	adc36e7d63	Clean code	2018-10-01 00:20:47 +02:00
Laurent Destailleur	e2f450aa8c	Fix regession losing description. Rename updateligne into updateline.	2018-09-28 16:15:17 +02:00
John BOTELLA	d8cd1c3fef	Fix total retained warranty	2018-09-28 09:03:37 +02:00
Laurent Destailleur	a88dcfd1e4	Fix phpcs	2018-09-28 02:24:11 +02:00
John BOTELLA	70eddf5d55	Add retained warranty in list	2018-09-27 15:38:43 +02:00
Laurent Destailleur	e252a5f046	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-27 12:55:45 +02:00
Laurent Destailleur	62b31df069	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/rssparser.class.php htdocs/langs/en_US/boxes.lang	2018-09-27 12:55:25 +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	ee8b5030a0	Merge pull request #9610 from atm-john/FIX_situation_credit_note Fix situation credit note	2018-09-27 09:26:23 +02:00
Laurent Destailleur	e3b1cb9fdb	Update facture.class.php	2018-09-27 09:25:37 +02:00
Philippe GRAND	746d73b8e6	Add some code comment	2018-09-25 17:26:57 +02:00
John BOTELLA	40369280ba	fix allow empty selection on form conditions reglement	2018-09-25 12:16:16 +02:00
John BOTELLA	022f842cb0	Fix display good progress for new situation invoices	2018-09-25 10:28:47 +02:00
John BOTELLA	791c373db5	FIX credit note progression	2018-09-25 09:54:58 +02:00
Laurent Destailleur	b93ab79679	FIX Error messages	2018-09-25 00:39:28 +02:00
John BOTELLA	b1380a6902	FIX situation invoice total with credit note	2018-09-24 16:12:00 +02:00
Laurent Destailleur	ad6895aa2e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-24 10:23:09 +02:00
Laurent Destailleur	57e359cd40	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/agenda.lang	2018-09-24 10:18:13 +02:00
Laurent Destailleur	dbb75e35a1	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/list.php htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/agenda.lang	2018-09-24 10:14:38 +02:00
Laurent Destailleur	e6791e1763	Merge pull request #9526 from frederic34/patch-10 completely comment unused code	2018-09-18 14:59:55 +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	7b3b020533	completely comment unused code	2018-09-16 09:41:38 +02:00
Laurent Destailleur	961505d510	NEW Add filter on staff range in list of thirdparties	2018-09-14 01:29:03 +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	de8496773d	Merge pull request #9441 from grandoc/new_branch_09_09_2018 New branch 09 09 2018	2018-09-12 18:24:34 +02:00
Laurent Destailleur	3662ebe3a3	Fix syntax error	2018-09-12 18:05:20 +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
Maxime Kohlhaas	c94689e9a9	FIX remain to pay for credit note was wrong on invoice list	2018-09-12 11:53:57 +02:00
Laurent Destailleur	aad6a0871f	FIX Lose filter on payment type or category after a sort on invoice list Conflicts: htdocs/compta/facture/list.php	2018-09-12 10:59:53 +02:00
Laurent Destailleur	7bea9f5ffb	FIX Lose filter on payment type or category after a sort on invoice list	2018-09-12 10:57:09 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Philippe GRAND	7fcbd0fe42	Standardize and update code	2018-09-09 11:10:32 +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
Maxime Kohlhaas	a5f4a74ecc	FIX : Homepage links were using wrong topmenus	2018-09-06 14:49:48 +02:00
Philippe GRAND	9025fd5891	Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0	2018-09-06 14:33:46 +02:00
Philippe GRAND	844333688b	typo	2018-09-06 14:33:22 +02:00
Frédéric FRANCE	4e619dd0ed	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 18:51:21 +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	9042d341f0	FIX #9316 Error when listing invoices	2018-09-04 11:19:31 +02:00
Laurent Destailleur	e7d2bcc34c	FIX #9316 Error when listing invoices	2018-09-04 11:17:08 +02:00
Laurent Destailleur	9697bdf3b0	FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES	2018-09-04 10:38:09 +02:00
Laurent Destailleur	db6f80e2ff	FIX invoice popup hide localtax2 and 3 if not defined	2018-09-04 00:42:15 +02:00
Laurent Destailleur	3d50c454c1	Code comment	2018-09-03 17:05:44 +02:00
Frédéric FRANCE	22b9632555	move phpcs:ignore	2018-09-02 21:08:57 +02:00
Philippe GRAND	3de16a145e	Standardize and update code	2018-09-02 11:08:41 +02:00
Philippe GRAND	ae2df6be11	Standardize and Update code	2018-09-01 23:04:46 +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
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
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	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
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Laurent Destailleur	0eb4f8bb96	NEW Can set the datestart and dateend of cron job into module descriptor	2018-08-29 11:47:20 +02:00
Laurent Destailleur	b5c2383f65	Fix type of invoice encoded twice	2018-08-28 18:34:53 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 Update and standardize code	2018-08-28 02:13:28 +02:00
Frédéric FRANCE	d8bf4a0ecf	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-25 09:07:04 +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
Laurent Destailleur	32594e8048	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-24 10:47:10 +02:00
Laurent Destailleur	a82d86cec4	FIX warning for late template invoices to remove when suspended	2018-08-24 10:46:47 +02:00
Philippe GRAND	2fa82edd39	Standardize and update code	2018-08-23 17:07:27 +02:00
Philippe GRAND	504b0e3d16	Update and standardize code	2018-08-22 18:34:50 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	29f15b4ae6	Update and standardize code	2018-08-22 10:51:55 +02:00
Philippe GRAND	a669830427	Update and standardize code	2018-08-22 10:37:16 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration function declaration	2018-08-21 13:41:56 +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
Laurent Destailleur	7103bfd7aa	Merge pull request #9253 from frederic34/patch-11 Update list.php	2018-08-21 13:11:26 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +02:00
Frédéric FRANCE	e63a748a70	Update list.php	2018-08-16 11:59:58 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Laurent Destailleur	ec56ad752c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-08-15 14:26:38 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	b977c3a9f5	Fix translation	2018-08-13 14:04:10 +02:00
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
Laurent Destailleur	30b4d88428	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/list.php htdocs/product/reassort.php htdocs/societe/list.php	2018-08-12 19:23:45 +02:00
Laurent Destailleur	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	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
John BOTELLA	681ae88e97	fix display cond	2018-08-10 16:59:22 +02:00
John BOTELLA	6fad0ea5bd	Add retained warranty to pdf	2018-08-10 16:03:39 +02:00
John BOTELLA	d6d8f98f38	add retained warranty cond field and add forms	2018-08-10 15:06:00 +02:00
Frédéric FRANCE	62b83412ee	test phpcs v3	2018-08-09 11:31:48 +02:00
John BOTELLA	06be98c638	add date field	2018-08-08 17:36:39 +02:00
Juanjo Menent	229a5d3532	Merge pull request #9203 from grandoc/new_branch_04_08_2018 comment translation	2018-08-08 11:07:18 +02:00
John BOTELLA	3036c94198	Add new situation retained warranty field	2018-08-07 15:18:42 +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
ATM-Nicolas	342a3ef663	NEW : Withdraw request massaction	2018-08-03 09:57:29 +02:00
Laurent Destailleur	e85ec19018	Merge pull request #9093 from atm-gauthier/FIX_filters FIX : page must always be 0 when we search	2018-08-02 17:48:35 +02:00
Juanjo Menent	b8efe3b239	Merge pull request #9172 from grandoc/new_branch_28_07_2018 standardize	2018-08-02 11:27:02 +02:00
John BOTELLA	4ddca02bb9	fix situation line's total	2018-07-31 14:58:33 +02:00
Philippe GRAND	d673848028	standardize	2018-07-30 17:28:44 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Laurent Destailleur	e024ea9c05	Merge pull request #9146 from grandoc/new_branch_24_07_2018 Clean and update code	2018-07-24 21:41:12 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Philippe GRAND	2a6f050e32	Clean and update code	2018-07-24 18:28:56 +02:00
Laurent Destailleur	ece655a84a	Merge pull request #9128 from atm-john/fix_situation_invoice_status Fix situation invoice status	2018-07-24 17:49:53 +02:00
Laurent Destailleur	869a97c8d1	Update card.php	2018-07-24 17:49:10 +02:00
Chl	0f115dafee	2 bugfix for PDF generated by Templates/Cron: DueDate and translation When launching Cron on a facturerec with auto_validate at 1, the generated PDF doesn't contain the DueDate, and some tokens like __INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not translated (tested with fr_FR).	2018-07-24 00:39:21 +02:00
John BOTELLA	0c01f6e139	Fix situation invoice status	2018-07-20 15:53:32 +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
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	45d1a14c8e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 16:10:37 +02:00
Laurent Destailleur	ed6ec8138d	Fix filter on invoice status	2018-07-06 16:06:15 +02:00
Laurent Destailleur	fb84211714	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 12:45:44 +02:00
Laurent Destailleur	6c5264fabb	Fix label	2018-07-06 12:45:20 +02:00
Inovea Conseil	7f137adef9	ADD check user's rights	2018-07-06 08:07:38 +02:00
Inovea Conseil	5011f252c1	ADD check user's rights	2018-07-05 19:00:41 +02:00
BENKE Charlene	c169ff4b97	Update facture.class.php	2018-07-05 12:01:48 +02:00
Inovea Conseil	30cff2bb36	ADD check user's rights	2018-07-05 11:52:41 +02:00
Laurent Destailleur	12c43d7722	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 12:33:17 +02:00
Laurent Destailleur	3c176adb38	Fix more complete fix for bad label in creating invoice from other obj	2018-07-02 16:46:30 +02:00
Laurent Destailleur	cae7cabe6d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-02 16:22:55 +02:00
Laurent Destailleur	b22754c60b	FIX label of source object	2018-07-02 16:22:40 +02:00
Laurent Destailleur	4e7f9b1b4d	Merge pull request #9038 from hregis/8.0_multicompany Fix: possibility to overload permissions (multicompany sharing)	2018-07-02 16:12:40 +02:00
Laurent Destailleur	63f3143718	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-02 12:18:34 +02:00
Laurent Destailleur	7bf33b1bac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/hrm/index.php htdocs/install/mysql/tables/llx_website_account.key.sql htdocs/modulebuilder/template/myobject_card.php	2018-07-02 12:16:51 +02:00
Laurent Destailleur	11021353da	Fix text in payment area of crabe pdf	2018-07-02 11:33:33 +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
Laurent Destailleur	982a1ffbaf	NEW Automatic position of scroll when creating an extrafield	2018-06-30 14:22:05 +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	969b272576	Rename menu entries and report title for better understanding	2018-06-26 11:18:31 +02:00
Laurent Destailleur	5c93fa1bfb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang	2018-06-26 01:25:03 +02:00
Laurent Destailleur	7f8570f720	Fix lang loading	2018-06-26 00:48:43 +02:00
Laurent Destailleur	af9d2c3b5a	Merge pull request #9008 from grandoc/new_branch_22_06_2018 clean and update code	2018-06-24 13:47:26 +02:00
Laurent Destailleur	0170906524	Look and feel	2018-06-23 14:39:24 +02:00
Laurent Destailleur	7daee6dc6b	A lot of fix of css and look and feel v8	2018-06-23 00:07:56 +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	d81398e72d	Fix info on tooltip	2018-06-18 16:27:25 +02:00
Laurent Destailleur	ad2df304b4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/lines.php htdocs/fourn/commande/card.php htdocs/societe/class/societe.class.php	2018-06-18 13:31:29 +02:00
Laurent Destailleur	95ee3325fc	Part of fix of #8972	2018-06-18 11:11:07 +02:00
Laurent Destailleur	910652eb6d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang	2018-06-13 23:07:30 +02:00
Laurent Destailleur	4c2af6fc70	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/html.form.class.php	2018-06-13 23:04:08 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Laurent Destailleur	c586f2ecf7	Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise	2018-06-13 21:20:42 +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
Marc de Lima Lucio	e992187f4c	FIX: handle sortorder on multiple columns + potential SQL field mismatch	2018-06-12 16:00:16 +02:00
Regis Houssin	7ce2ebf1a9	Fix: wrong var name	2018-06-07 16:25:47 +02:00
Laurent Destailleur	a7b38db31f	Fix bug reported by scrutinizer	2018-06-06 18:55:50 +02:00
gauthier	77e7932671	FIX : sometimes amounts are identical but php find them different.	2018-06-05 11:33:58 +02:00
Laurent Destailleur	7c0afbe025	Clean code	2018-05-31 17:12:08 +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	4d60fb3468	Fix size of popup	2018-05-29 10:57:14 +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
Laurent Destailleur	5da89e1cad	Remove log	2018-05-27 19:33:46 +02:00
Laurent Destailleur	f3f252e88b	Fix duplicate record before creating primary key	2018-05-27 19:31:03 +02:00
Frédéric FRANCE	5c8f966898	Merge remote-tracking branch 'upstream/develop' into loadlangs	2018-05-27 18:41:17 +02:00
Laurent Destailleur	3f489ee3c6	Fix look and feel v7 for popup on ref of social contributions payments	2018-05-27 17:58:32 +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	84f2b31d46	loadlangs	2018-05-27 09:40:17 +02:00
Frédéric FRANCE	4d5c28b597	loadlangs	2018-05-27 09:27:09 +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	b25c7e44d3	Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice FIX : test is_erasable() must be done before call function delete()	2018-05-25 11:05:20 +02:00
Laurent Destailleur	0a581e48d4	Update card.php	2018-05-25 11:04:04 +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
Laurent Destailleur	a1c799507a	Fix $contactobject not always defined	2018-05-23 08:16:24 +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	745aa4bd73	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-21 23:38:46 +02:00
Laurent Destailleur	8951c4a7a5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-05-21 23:36:47 +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
gauthier	4c3f9d6d5e	FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url	2018-05-18 15:20:16 +02:00
Laurent Destailleur	24281028b7	Merge pull request #8807 from inoveaconseil/patch-2 Fix missing params for commonGenerateDocument	2018-05-18 11:43:11 +02:00
Laurent Destailleur	e724cfd6a2	Merge pull request #8802 from atm-john/new_avoir_situation Add credit note compatibility with situation invoice.	2018-05-18 11:34:10 +02:00
Laurent Destailleur	e2369dea29	FIX #8722	2018-05-18 11:17:21 +02:00
Laurent Destailleur	dd53f414f8	Merge pull request #8788 from bugness-chl/develop Fix #8722 useless sql ORDER BY	2018-05-18 11:16:08 +02:00
John	3dd11e1eaf	Fix discount id	2018-05-18 11:02:04 +02:00
Laurent Destailleur	689ef37d56	Merge pull request #8781 from atm-john/extend_import_lines_from_linked_element Add propals lines inport on invoices.	2018-05-18 08:55:29 +02:00
Inovea Conseil	5804d1d4a3	Fix missing params for commonGenerateDocument ADD param moreparams for compatibility with commonGenerateDocument	2018-05-17 10:16:44 +02:00
John	8175d90816	change case	2018-05-17 09:01:49 +02:00
Laurent Destailleur	ac97ba9e36	Fix deletion of stripe card Solve validation of recurring invoice	2018-05-16 20:41:01 +02:00
John	fddd3156b1	add hidden conf	2018-05-16 16:15:30 +02:00
John	c67ab2a758	add hidden conf	2018-05-16 16:14:49 +02:00
John	4a0195deee	Fix merge mistake	2018-05-16 15:55:56 +02:00
John	f773317bf5	remove comment and move table	2018-05-16 15:55:42 +02:00
John	b01893d536	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull	2018-05-16 15:29:57 +02:00
Laurent Destailleur	ef395fc36b	Fix scrutinizer bugs	2018-05-16 15:23:52 +02:00
John	05bb98f4c0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-05-16 11:49:37 +02:00
John	b42c87256c	Fix_situation_discount_used	2018-05-14 14:55:33 +02:00
Chl	9b2f62791b	Fix #8722 useless sql ORDER BY	2018-05-13 15:52:47 +02:00
atm-john	6b2dfa0528	Extend lines import to propal	2018-05-10 21:06:18 +02:00
atm-quentin	8cd6c72a2f	NEW advanced rights	2018-05-07 10:04:43 +02:00
Laurent Destailleur	97f161b276	Update list.php	2018-05-05 14:25:44 +02:00
Abbes Bahfir	17b8de2cdd	New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED	2018-05-05 12:57:29 +01: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
Laurent Destailleur	3374c50e2d	CSS	2018-05-01 10:42:09 +02:00
Laurent Destailleur	aafab12f4b	Debug API for ticket module	2018-04-29 18:06:31 +02:00
Laurent Destailleur	e3142fff39	NEW Add method to register distributed payments on invoices	2018-04-27 11:38:31 +02:00
Laurent Destailleur	469d909126	Revert "Revert "NEW : Adds a contact to an invoice with REST API""	2018-04-27 10:46:09 +02:00
Laurent Destailleur	df9f4d3193	Revert "NEW : Adds a contact to an invoice with REST API"	2018-04-27 10:40:27 +02:00
Laurent Destailleur	fb582c2444	Merge pull request #8682 from Oeris/develop NEW : Adds a contact to an invoice with REST API	2018-04-27 10:37:04 +02:00
Laurent Destailleur	27997b8c11	Merge pull request #8675 from ATM-Nicolas/fix_link_credit_note Fix link credit note	2018-04-27 10:12:31 +02:00
Neil Orley	00fb4300fc	FIX : return type change from array to int	2018-04-26 12:03:55 +02:00
Neil Orley	bf3b99163d	NEW : Adds a payment for the list of invoices given as parameter Adds a payment for the list of invoices given as parameter ie : 1 payment for x invoice	2018-04-26 11:59:59 +02:00
Neil Orley	991d5c4215	NEW : Adds a contact to an invoice Adds a contact to an invoice using the REST API	2018-04-25 16:04:21 +02:00
Laurent Destailleur	5d01efb79d	Code comment	2018-04-24 20:27:02 +02:00
ATM-Nicolas	b272d766a9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_link_credit_note	2018-04-24 11:48:49 +02:00
ATM-Nicolas	64dde1595b	FIX : Credit note links set from source invoice links	2018-04-24 11:48:26 +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	32511422ab	Fix PSR2	2018-04-22 20:08:29 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	c81c744aaf	Clean deprecated var	2018-04-21 13:14:58 +02:00
Laurent Destailleur	ccd9aa8059	Fight against dolibarr warnings	2018-04-21 12:16:12 +02:00
Laurent Destailleur	1031fcd796	logs	2018-04-21 00:37:05 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	faea6861c3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/invoicetemplate_list.php htdocs/langs/en_US/bills.lang	2018-04-16 18:19:21 +02:00
Laurent Destailleur	622042e9b2	FIX Max nb of generation of recurring invoice should not show warning	2018-04-16 15:05:35 +02:00
Laurent Destailleur	f1ad3912e7	Fix multicompany compatibility for recurring invoice generation	2018-04-16 14:18:38 +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	187cc35786	Look and feel v8	2018-04-14 22:23:56 +02:00
Laurent Destailleur	6f91b8019f	Remove warnings	2018-04-13 17:54:27 +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
John	24bf8cb162	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-04-09 16:21:37 +02:00
John	63180f45a8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation	2018-04-09 09:17:26 +02:00
Laurent Destailleur	99ed9c4589	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/card.php htdocs/compta/facture/list.php	2018-04-08 13:10:10 +02:00
Laurent Destailleur	79af10fc83	Fix search filters	2018-04-08 13:01:42 +02:00
Laurent Destailleur	e7d69b18bd	Merge pull request #8504 from ATM-Nicolas/develop NEW : Add link between credit note invoice and origin	2018-04-06 09:15:02 +02:00
TuxGasy	47dcc0d5c6	fix notrigger ignored on BILL_CREATE	2018-04-05 18:32:41 +02:00
Laurent Destailleur	9892a97424	Merge pull request #8509 from tuxgasy/5.0_notrigger_BILL_CREATE fix notrigger ignored on BILL_CREATE	2018-04-05 18:27:45 +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	b02f34b038	Add line edit progress test	2018-04-05 17:13:45 +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	689b3e3b64	Fix outing invoice ligne progress	2018-04-05 11:25:11 +02:00
John	b37a2f17bf	Fix credit note update on remove from cycle action	2018-04-05 10:48:20 +02:00
John	e966d11356	Fix credit note card apparence	2018-04-05 09:46:55 +02:00
TuxGasy	e5664f9630	fix notrigger ignored on BILL_CREATE	2018-04-04 20:32:36 +02:00
John	ce24ca08ee	move list of situation table and fix credit note display	2018-04-04 12:33:48 +02:00
ATM-Nicolas	b9a91c667f	NEW : Add link between credit note invoice and origin	2018-04-04 09:33:59 +02:00
John	299859d0c4	add action to remove from cycle	2018-04-03 17:34:20 +02:00
John	70321a8b71	add button to remove from cycle	2018-04-03 15:12:44 +02:00
John	b7681e7249	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation	2018-04-03 14:12:49 +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
John	227e4ef9a6	fix php compatibility	2018-04-03 10:50:15 +02:00
Laurent Destailleur	2d3a55a6a8	Restore broken confirmation popup	2018-03-31 23:39:08 +02:00
Laurent Destailleur	927d86f27f	Revert "NEW: formconfirm in javascript" This reverts commit `50790d5527`.	2018-03-31 23:10: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	7c394733e4	Merge pull request #8445 from ATM-Consulting/develop_atm NEW: bank reconcile: checkbox to select all bank operations	2018-03-29 14:49:41 +02:00
Alexandre SPANGARO	6e27da605a	Add label project in tooltip in customer/supplier list	2018-03-27 21:41:25 +02:00
John	88fab15c60	Change situation display	2018-03-23 17:12:09 +01:00
Marc de Lima Lucio	50790d5527	NEW: formconfirm in javascript	2018-03-23 16:54:33 +01:00
John	6a676ea49e	fix percent	2018-03-23 12:24:47 +01:00
Laurent Destailleur	171ad5dce2	Enhance code for template invoices	2018-03-22 21:42:19 +01:00
Laurent Destailleur	9980a5fbd0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog	2018-03-22 14:08:43 +01:00
John	b4983d0e6d	FIX invoice filter	2018-03-22 11:37:16 +01:00
John	fd86e90df2	Add create creadit note btn	2018-03-22 11:19:39 +01:00
Laurent Destailleur	227b830aa2	Fix visible rounding of abandonned amount	2018-03-22 09:41:30 +01:00
John	f91fe41f45	prepare invoice selection and calculation	2018-03-19 15:50:56 +01:00
Laurent Destailleur	12068f9cf3	Merge branch 'develop' into 8.0-a7	2018-03-19 12:18:18 +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	07fb29f0c4	Fix var not initialized	2018-03-16 12:18:20 +01:00
Laurent Destailleur	1716ac5f44	Fix var not initialized	2018-03-16 01:05:49 +01:00
Laurent Destailleur	98b7d4c2e2	NEW Can set the start/end date of service line in invoice templates	2018-03-12 12:27:40 +01:00
Laurent Destailleur	93f4d6fdcd	Translation	2018-03-11 21:34:38 +01:00
Laurent Destailleur	390618db47	Fix bad space	2018-03-10 22:42:28 +01:00
Laurent Destailleur	bdb6a09762	Fix phpcs	2018-03-10 22:41:57 +01:00
Laurent Destailleur	b0bd8cf910	Update facture.class.php	2018-03-10 12:56:19 +01:00
florian HENRY	40fb803ffd	scrunitizer	2018-03-10 09:34:33 +01:00
florian HENRY	63fb53159c	fix scrunitizer	2018-03-10 01:12:47 +01:00
Laurent Destailleur	20ec269d4d	Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink 7.0 betterthirdpartylink	2018-03-09 23:03:23 +01:00
Laurent Destailleur	d8d13a7348	Merge branch 'develop' into 7.0_fix_invoicelist	2018-03-09 22:37:20 +01:00
florian HENRY	a34709c112	fix better thirdparty link	2018-03-09 22:36:00 +01:00
florian HENRY	164ca682d5	fix add "late" invoice into "save last search/backtolist" feature	2018-03-09 17:23:43 +01:00
Regis Houssin	82057b3523	Fix: use code instead id	2018-03-09 08:11:02 +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	861a831e24	Fix: debug	2018-03-08 11:53:46 +01:00
Regis Houssin	fd9c79fa7f	Fix: use getEntity if no rowid to compare	2018-03-08 07:42:17 +01:00
Regis Houssin	93a9430e49	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
Alexandre SPANGARO	0182b724aa	Merge remote-tracking branch 'uptream/develop' into 8.0-a7	2018-03-08 06:53:54 +01:00
Alexandre SPANGARO	3f2aa6a4fb	New : On invoice card, show accounting account linked	2018-03-08 06:52:31 +01:00
Laurent Destailleur	fe45e82e99	Fix use of table llx_c_paiement (param showempty was not used/set)	2018-03-07 19:00:38 +01:00
Laurent Destailleur	c1497b065c	CSS	2018-03-07 14:13:55 +01:00
Laurent Destailleur	1ca5c7083a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formother.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2018-03-07 11:54:48 +01:00
Laurent Destailleur	1e6a55745c	CSS	2018-03-06 11:54:05 +01:00
Laurent Destailleur	0cfa19ee09	NEW Online payment of invoice and subscription record the payment automatically.	2018-03-06 00:12:23 +01:00
Laurent Destailleur	d569adea2f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-05 21:46:40 +01:00
Laurent Destailleur	2f9f4d0675	WIP Create payment of member subscription with paypal	2018-03-05 21:46:24 +01:00
Alexis ALGOUD	35002cf93d	Merge branch 'develop' into NEW_price_on_stock_mvt	2018-03-05 17:45:27 +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
Laurent Destailleur	82fd84fb48	Fix scrutinizer errors	2018-03-04 11:22:43 +01:00
Laurent Destailleur	4137e1cc76	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-02 17:56:30 +01:00
Laurent Destailleur	6bb91dd5d2	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-03-02 17:54:42 +01:00
Marc de Lima Lucio	451d943927	NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)	2018-03-02 16:48:25 +01:00
Laurent Destailleur	2368cb615f	Look and feel v8	2018-03-01 11:51:25 +01:00
Marc de Lima Lucio	059801fe03	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-01 10:22:21 +01:00
Laurent Destailleur	ee488ed83e	FIX invoice creation fails when next date not defined	2018-02-27 20:24:50 +01:00
Laurent Destailleur	f3c9d38f82	FIX invoice creation fails when next date not defined	2018-02-27 20:23:55 +01:00
Laurent Destailleur	04934cc4aa	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php	2018-02-27 19:18:43 +01:00
Laurent Destailleur	75cbc466d5	Fix warning	2018-02-27 19:08:38 +01:00
Laurent Destailleur	b090f0da9c	Fix warning	2018-02-27 19:07:58 +01:00
Laurent Destailleur	1907b9c52d	Fix search on dates on template invoices	2018-02-27 19:04:21 +01:00
Laurent Destailleur	7ba263c9ab	Fix search on dates on template invoices	2018-02-27 19:03:14 +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
gauthier	4d05bff780	FIX : if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back	2018-02-27 12:27:25 +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	4866d63ece	Fix method getListOfPayments in the wrong class	2018-02-26 09:45:15 +01:00
Laurent Destailleur	41638e6dff	Fix back link of look and feel v7	2018-02-26 09:20:05 +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	7ff94c88bd	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-25 15:00:31 +01:00
Laurent Destailleur	251136bebf	Fix PHPUnit	2018-02-25 15:00:14 +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	3b54afc9b2	Fix type lines import	2018-02-23 12:12:36 +01:00
John	c5b96e43c7	add new action to import order in invoice	2018-02-22 16:55:41 +01:00
John	a7a6630fad	Add popin dialog	2018-02-22 15:19:20 +01:00
Laurent Destailleur	b87feab1e3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2018-02-22 12:19:20 +01:00
Laurent Destailleur	bc0993d6cd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-22 12:17:25 +01:00
John	3c1803f1f2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-02-21 17:44:08 +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
John	629b8e618e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-02-21 11:45:23 +01:00
Laurent Destailleur	72c1357c9b	NEW Section of files generated by mass action not visible if empty	2018-02-21 11:02:45 +01:00
Marc de Lima Lucio	d3f848b7bc	FIX: supplier credit notes: harmonize discount filters part 2	2018-02-21 09:30:39 +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
Laurent Destailleur	7f419a29e7	Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill fix the bill replacement with discounts #8028	2018-02-20 15:19:19 +01:00
John	46b235c139	add auto select model when select type on create invoice	2018-02-20 15:08:57 +01:00
Laurent Destailleur	b361877ea8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/card.php	2018-02-20 12:48:28 +01:00
Marc de Lima Lucio	95be155010	FIX: supplier credit notes: harmonize discount filters	2018-02-20 12:26:29 +01:00
Laurent Destailleur	32e8bab20d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-20 11:01:20 +01:00
Laurent Destailleur	16fca2ee35	Fix bad link	2018-02-20 10:05:11 +01:00
Marc de Lima Lucio	44b0d1ca0f	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-19 17:33:20 +01:00
Marc de Lima Lucio	a66f7b8bc8	FIX: supplier credit notes: wrong discount filters	2018-02-19 17:32:59 +01:00
Laurent Destailleur	d233c152a7	Code comment	2018-02-16 14:18:05 +01:00
Marc de Lima Lucio	e2b65b3755	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note	2018-02-16 09:14:53 +01:00
John	49bad95d31	fix method exist test	2018-02-15 17:04:27 +01:00
John	63987fa32e	fix invoice extrafield transmition to credit	2018-02-15 16:39:47 +01:00
Laurent Destailleur	7f8cbc0f62	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/adherents/type.php htdocs/contrat/services.php htdocs/contrat/tpl/linkedobjectblock.tpl.php htdocs/install/upgrade2.php	2018-02-14 22:08:18 +01:00
Marc de Lima Lucio	4f9bb33600	NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid	2018-02-14 10:47:10 +01:00
atm-ph	c690dfb258	Fix apply global progress don't update multicurrency values	2018-02-14 10:15:38 +01:00
Laurent Destailleur	30ba1c1702	FIX #8174	2018-02-12 14:02:51 +01:00
Laurent Destailleur	975608b9d3	FIX #8174	2018-02-12 03:21:04 +01:00
Laurent Destailleur	ab21769aa2	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/card.php	2018-02-08 12:58:47 +01:00
Laurent Destailleur	c988d3f1cc	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/compta/facture.php	2018-02-08 12:53:26 +01:00
Laurent Destailleur	074f4a3b46	Fix class not found when selecting project ref in lists	2018-02-06 00:34:14 +01:00
Laurent Destailleur	85964e02de	Fix css	2018-02-05 12:34:11 +01:00
Laurent Destailleur	5455ab3280	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/projet/card.php	2018-02-04 23:17:09 +01:00
Regis Houssin	8ee1186492	Fix: wrong test	2018-02-04 09:05:35 +01:00
Regis Houssin	c1e6d88442	Fix: use product_type instead special_code	2018-02-04 08:55:51 +01:00
Regis Houssin	38d735341c	Fix: remove lines with special code when convert to reduc	2018-02-02 10:24:16 +01:00
Laurent Destailleur	74a34acf77	Tab vs space	2018-02-01 02:14:17 +01:00
Laurent Destailleur	9c6b6f244c	Fix tooltip on invoice	2018-02-01 01:25:45 +01:00
Laurent Destailleur	8ae25b3c65	Fix the FACTURE_ENABLE_NEGATIVE was useless without FACTURE_ENABLE_NEGATIVE_LINES	2018-01-29 16:21:54 +01:00
De Coninck Laurent	53ac13c792	check on type replacement #8028	2018-01-23 18:03:29 +01:00
De Coninck Laurent	4874d08062	fix the bill replacement with discounts #8028	2018-01-19 09:01:37 +01:00
Laurent Destailleur	768c93a707	Fix suggested amount for direct debit order	2018-01-18 18:22:10 +01:00
Laurent Destailleur	57f664c0c1	Fix vat npr for template invoices	2018-01-17 19:45:23 +01:00
Laurent Destailleur	56d702e3c6	Fix missing property in tooltip	2018-01-17 16:26:24 +01:00
Laurent Destailleur	aa1692483f	Fix colspan	2018-01-13 16:06:04 +01:00
Laurent Destailleur	8b972313ae	Fix scrutinizer	2018-01-12 15:38:53 +01:00
Laurent Destailleur	b225a6f79c	Better translation	2018-01-11 20:19:53 +01:00
Laurent Destailleur	e152e81d18	Fix close code	2018-01-11 18:24:40 +01:00
Laurent Destailleur	af6b84ba3a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/list.php htdocs/contact/document.php htdocs/product/list.php	2018-01-11 01:03:13 +01:00
Laurent Destailleur	436b653fa0	Error report	2018-01-11 00:16:45 +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	b9015de7e2	Fix can't edit payment mode / default bank account	2018-01-05 19:52:23 +01:00
Laurent Destailleur	d7837f8800	Try fix for #7778	2018-01-05 01:43:51 +01:00
Laurent Destailleur	a3c6746b6f	Merge #8008 manually	2018-01-04 23:50:15 +01:00
Laurent Destailleur	1464937c66	Merge #8008 manually	2018-01-04 23:44:21 +01:00
Laurent Destailleur	f19fb90ab0	Merge #8008 manually	2018-01-04 23:36:14 +01:00
Laurent Destailleur	300d4e1603	Fix disable direct debit request for replaced invoices	2018-01-04 14:35:02 +01:00
John	1331e8add7	fix filter for TYPE_SITUATION invoice	2018-01-02 17:19:42 +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	bbcf70cf4e	Remove spaces	2017-12-28 09:48:41 +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	493669e986	Fix look and feel v7	2017-12-22 14:19:12 +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	9d10eb57f2	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/dolibarr_changes.txt htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/main.inc.php	2017-12-20 13:28:41 +01:00
Laurent Destailleur	57603e3df4	Update api_invoices.class.php	2017-12-19 18:16:39 +01:00
Laurent Destailleur	bffed79132	Update api_invoices.class.php	2017-12-19 18:06:05 +01:00
Neil Orley	a3f4066790	NEW Update bank account when updating an invoice Add the ability to update the bankaccount when updating an invoice	2017-12-19 14:14:26 +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
Laurent Destailleur	fcf04c122f	Fix phpcs	2017-12-19 00:39:01 +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	ee6b0d7237	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-12-18 14:36:29 +01:00
Laurent Destailleur	98b82d712a	NEW Revenue stamp can be a percent FIX Revenue stamp not visible on the transfer payment page	2017-12-18 12:43:03 +01:00
Laurent Destailleur	a020dbf3d7	Merge pull request #7953 from atm-ph/fix_6.0_checkbox_credit_note Fix since jquery 3 we can check all checkbox of credit note options	2017-12-16 01:13:55 +01:00
Neil Orley	e61d625577	FIX error message	2017-12-15 10:02:23 +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
atm-ph	a2f4afbf88	Fix wrong or missing char for url	2017-12-13 16:17:22 +01:00
atm-ph	46770178d2	Fix since jquery 3 we can check all checkbox of credit note options	2017-12-13 15:24:09 +01:00
Laurent Destailleur	af1028576d	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
Laurent Destailleur	9314dcb046	Fix regression	2017-12-12 10:13:48 +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	48499fb506	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-12-11 15:21:22 +01:00
Laurent Destailleur	dbd96d1ac7	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/loan/card.php htdocs/loan/class/loan.class.php	2017-12-10 21:46:23 +01:00
Maxime Kohlhaas	12d0928244	Fix display error message when stock not enough on invoice validation	2017-12-10 19:59:56 +01:00
Laurent Destailleur	4443c0f0a0	Fix style	2017-12-10 15:24:47 +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
Laurent Destailleur	98149ae316	Fix regression	2017-12-06 23:31:42 +01:00
Laurent Destailleur	2c19c0a10e	Fix test	2017-12-05 20:16:28 +01:00
Laurent Destailleur	21ba8509c9	Merge pull request #7910 from ATM-Nicolas/6.0_fix_project_conf NEW link project from other company conf	2017-12-05 19:18:07 +01:00
Laurent Destailleur	5ab7fa7422	Fix location on good page	2017-12-05 15:48:24 +01:00
Laurent Destailleur	3a9bf455e2	FIX #7870	2017-12-05 13:38:24 +01:00
Laurent Destailleur	93311e3817	FIX #7885	2017-12-05 12:31:57 +01:00
ATM-Nicolas	bdf1e30ef3	Merge branch 'develop' into 6.0_fix_project_conf	2017-12-05 12:20:48 +01:00
Laurent Destailleur	8019f73f99	Fix: protection to not delete invoice if invoice is in bookkeeping	2017-12-05 10:01:30 +01:00
Laurent Destailleur	9b5f7099f7	Code comment	2017-12-03 19:50:15 +01:00
Laurent Destailleur	11286dee4a	Delete of payment	2017-12-03 11:59:16 +01:00
Laurent Destailleur	1f4a079f01	Fix bug reported by scrutinizers	2017-12-02 15:03:14 +01:00
Laurent Destailleur	38be224665	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-12-02 14:14:26 +01:00
Laurent Destailleur	29568287ef	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-12-02 14:13:44 +01:00
Laurent Destailleur	5fae19b4d6	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-12-02 14:13:29 +01:00
Laurent Destailleur	c7d0e917fb	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-12-02 14:12:43 +01:00
Laurent Destailleur	9cafb08759	Merge pull request #7853 from atm-ph/fix_5.0_invoice_updateline_calcul_price_total Fix product type is ignored and can generate a diffrent result with s…	2017-12-02 14:06:25 +01:00
gauthier	f04af6c1b3	FIX : test for filter fk_status	2017-11-29 11:06:33 +01:00
Laurent Destailleur	c1e6d35ca5	Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search factorization of extrafields into list	2017-11-28 12:14:47 +01:00
Laurent Destailleur	a9d3e90b70	Big debug of accountancy module	2017-11-27 21:53:22 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
atm-ph	5fef6478a5	Fix wrong calcul_price_total() update	2017-11-27 11:26:41 +01:00
Laurent Destailleur	5bdb7d1b98	Fix line "none" must not be visible if there is lines	2017-11-25 23:28:00 +01:00
Laurent Destailleur	6a9056a924	Fix line "none" must not be visible if there is lines	2017-11-25 23:26:14 +01:00
Laurent Destailleur	e99f190ff1	Save search context on list of template invoices	2017-11-25 15:56:36 +01:00
Laurent Destailleur	dbcb38dd3b	Use short label on table	2017-11-25 15:13:39 +01:00
Laurent Destailleur	1d97dd2bd8	NEW can filter on status of template invoices	2017-11-25 15:08:19 +01:00
Laurent Destailleur	77509ee37a	Removed deprecated apis	2017-11-25 13:14:28 +01:00
Laurent Destailleur	412c4e335d	Fix method of herited object has same signature than parent	2017-11-25 11:10:52 +01:00
Laurent Destailleur	4f4f929efb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/holiday/class/holiday.class.php	2017-11-24 17:02:14 +01:00
Laurent Destailleur	3db52b5f9e	Debug responsive of v7	2017-11-24 14:23:25 +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	5a2fe13958	Fix travis	2017-11-22 21:36:01 +01:00
atm-ph	219e58d0e4	Fix product type is ignored and can generate a diffrent result with situation invoice	2017-11-22 12:15:02 +01:00
ptibogxiv	16e791913f	Fix import date fix import date when creation	2017-11-19 21:56:50 +01:00
ptibogxiv	35182066a8	update createfromorder lack of 2 fields date_start and date_end not imported from order	2017-11-19 16:25:35 +01:00
Laurent Destailleur	f284cd6c0f	Fix phpcs	2017-11-18 02:15:56 +01:00
Laurent Destailleur	14946a0dfa	Fix sort on status	2017-11-18 02:14:04 +01:00
Laurent Destailleur	a00353f332	Fix link to create invoice from template on list	2017-11-18 02:07:52 +01:00
Laurent Destailleur	fc1441086c	Fix status in template invoice	2017-11-18 02:01:04 +01:00
Laurent Destailleur	03cc685037	NEW Add a status enabled/disabled on recurring invoices	2017-11-18 00:54:23 +01:00
Laurent Destailleur	cf0d67d71c	Generation of pdf become default value	2017-11-17 23:57:32 +01:00
Laurent Destailleur	77a0762fc1	Fix comment	2017-11-17 15:07:32 +01:00
Laurent Destailleur	2f6dfc2387	Merge pull request #7800 from atm-maxime/new_deposit_convert_unpaid NEW deposits can be converted even if unpaid	2017-11-17 15:05:33 +01:00
Laurent Destailleur	f68b2bdeca	Use the confirmation when deleting from mass action everywhere.	2017-11-15 11:39:11 +01:00
Neil Orley	8e869688f5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-11-15 10:42:00 +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
Neil Orley	9b2611933d	NEW Create an invoice using an existing order Create an invoice using an existing order using the REST API	2017-11-14 15:49:09 +01:00
Neil Orley	e513ed09f6	Change the way pa_ht is calculated	2017-11-14 14:43:50 +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	f33182acc5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-12 20:49:53 +01:00
Laurent Destailleur	836f6bf3c9	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
Laurent Destailleur	cba3a3846f	Merge pull request #7790 from frederic34/facrecmodelpdf NEW generate also document when invoice is build from recurring template	2017-11-11 17:42:26 +01:00
Laurent Destailleur	d1860b87f8	NEW Add a confirmation for all mass action 'delete'	2017-11-11 16:34:11 +01:00
Maxime Kohlhaas	22a3721dda	Fix multi VAT deposit when special lines are in origin document	2017-11-11 16:10:06 +01:00
Maxime Kohlhaas	60fcddb9e4	NEW deposits can be converted even if unpaid	2017-11-11 12:07:55 +01:00
Laurent Destailleur	11cc82e6d2	Update doc	2017-11-10 10:15:50 +01:00
Frédéric FRANCE	5621e85c00	comment	2017-11-10 00:26:01 +01:00
Frédéric FRANCE	6f647f8a40	generate doc on cron jobs	2017-11-09 23:39:28 +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	21a0f11395	Merge pull request #7760 from Oeris/develop-api NEW Adds the payment reference to the return of the function getListOfPayements	2017-11-05 18:29:59 +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
Neil Orley	3ecccadb8b	NEW Adds the payment reference to the return of the function getListOfPayements Adds the payment reference to the return of the function getListOfPayements	2017-11-03 13:04:23 +01:00
Frédéric FRANCE	b58df17545	default currency on propal create	2017-11-02 18:14:55 +01:00
Laurent Destailleur	309e83a946	Remove the "add" in addpayment. Action in API is hosted by the method	2017-11-02 16:06:44 +01:00
Laurent Destailleur	36f7f32205	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-02 16:02:24 +01:00
Laurent Destailleur	d70f9e053e	Remove the get in url. The GET is already in the method.	2017-11-02 16:01:13 +01:00
Laurent Destailleur	93ab4cadff	Merge pull request #7753 from Oeris/develop-api NEW Add REST API to add payment line to a specific invoice	2017-11-02 15:54:22 +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
Neil Orley	5febdf7bae	NEW Add payment line to a specific invoice using the REST API Add payment line to a specific invoice using the REST API	2017-11-02 15:01:38 +01:00
Frédéric FRANCE	01a3787664	swap llxfooter() and $db->close()	2017-10-31 13:45:13 +01:00
Laurent Destailleur	068f5e32cb	NEW Tooltip for substitutions variables on tooltips on admin pages	2017-10-31 11:17:44 +01:00
Laurent Destailleur	75bbcdf575	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-29 11:29:01 +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
Neil Orley	9a1c684870	FIX wrong paramters name in the usecreditnote method Rename 'creditnoteid' with 'discountid' in the URI Rename 'creditId' with 'discountid' in the method	2017-10-27 10:02:17 +02:00
Laurent Destailleur	ee1996ad37	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-27 01:16:51 +02:00
Laurent Destailleur	740c89365d	Code comment	2017-10-27 00:42:44 +02:00
Laurent Destailleur	6a9837528e	Merge pull request #7703 from Oeris/develop-api FIX Data related to customer moved to thirparties api	2017-10-27 00:42:10 +02:00
Laurent Destailleur	f4a06aef3f	Update api_invoices.class.php	2017-10-27 00:36:06 +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
Neil Orley	da0a205a10	NEW Deduct an available credit to an existing invoice Deduct an available credit to an existing invoice using the REST API	2017-10-25 17:09:37 +02:00
Neil Orley	3e53a2ecff	FIX merging conflict	2017-10-25 14:52:33 +02:00
Neil Orley	ff760eb8d5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-10-25 14:46:44 +02:00
Neil Orley	257acb6679	NEW Insert a discount in a specific invoice using the REST API Add ability to insert a discount in a specific invoice.	2017-10-25 14:41:12 +02:00
Neil Orley	ec6a19a123	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api-down-payments	2017-10-25 09:57:53 +02:00
Laurent Destailleur	f24204c79a	Error management after extrafield update	2017-10-24 19:04:40 +02:00
Laurent Destailleur	9f0f5eb5e8	Fix translation of extrafields type	2017-10-24 18:05:43 +02:00
Neil Orley	b4c484cf0b	NEW Get available assets of an invoice using the REST API Returns a list of paid down-payments, available avoirs, etc. with the payments detail	2017-10-24 14:29:28 +02:00
Laurent Destailleur	8592e1b1e8	Update api_invoices.class.php	2017-10-24 12:49:37 +02:00
Laurent Destailleur	b6825703b4	Update api_invoices.class.php	2017-10-24 12:47:15 +02:00
Neil Orley	c34a6db13a	Rename assets with avoirs	2017-10-24 11:53:39 +02:00
Neil Orley	41104de7ce	NEW Get available assets of an invoice using the REST API Returns a list of paid down-payments, available avoirs, etc. with the payments detail	2017-10-24 11:47:25 +02:00
Neil Orley	02c8f7f905	Modify rights check in the getPayments method	2017-10-24 11:25:31 +02:00
Neil Orley	0a43a12420	NEW Get a payment list of a given invoice using the REST API Add the getpayments method to retrieve a list of payments of a given invoice	2017-10-24 10:50:38 +02:00
Neil Orley	2a9ddf7437	Remove whitespace	2017-10-23 16:49:00 +02:00
Neil Orley	bd0079b3f1	NEW Retrieve available discounts and payments details from an invoice Adds the ability to get availbales discounts and payments details of a specific invoice unsing the REST API.	2017-10-23 16:45:49 +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	78ffe15a04	Code comment	2017-10-22 14:03:59 +02:00
Laurent Destailleur	83c1928034	Fix duplicate methods	2017-10-22 12:21:44 +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	1202853001	Fix syntax error	2017-10-19 19:12:00 +02:00
Laurent Destailleur	f7556e7ad2	FIX make of link to other object during creation	2017-10-19 19:06:48 +02:00
Laurent Destailleur	d4ade7b935	FIX API to get object does not return data o flinked objects	2017-10-19 17:57:16 +02:00
Laurent Destailleur	cb089987ee	Fix code comment	2017-10-19 12:35:15 +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	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	d70c215ab8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/bankentries.php htdocs/fourn/facture/card.php	2017-10-17 11:14:58 +02:00
Laurent Destailleur	81e7f45200	FIX Stats on invoices show nothing	2017-10-17 11:08:49 +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
Laurent Destailleur	b491d22c16	FIX selection of thirdparty was lost on stats page of invoices	2017-10-14 02:30:33 +02:00
Laurent Destailleur	4296df45af	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/projet/list.php htdocs/user/card.php	2017-10-13 22:01:56 +02: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	558f261b60	FIX #7593	2017-10-13 01:03:33 +02:00
Laurent Destailleur	8c5cf9ea45	Fix date output	2017-10-12 18:04:47 +02:00
Laurent Destailleur	45b4572ad4	Label shorter	2017-10-12 13:30:28 +02:00
gauthier	1e7676d26f	FIX : wrong key in selectarray	2017-10-12 09:30:04 +02:00
Laurent Destailleur	ca0af5cddf	NEW Bulk action validate on customer invoices	2017-10-12 02:25:17 +02:00
Laurent Destailleur	084dc7798d	Standardize use of function getCommonSubstitutionArray	2017-10-09 14:51:42 +02:00
Laurent Destailleur	8f24a86352	NEW If max nb of generation is reached, date for next gen is striked	2017-10-09 14:16:22 +02:00
Laurent Destailleur	8aa924fa08	NEW The bank account is visible on payment of taxes	2017-10-07 21:03:46 +02:00
Laurent Destailleur	af1d2bfffd	Standardize code	2017-10-07 14:11:01 +02:00
Laurent Destailleur	1b399dc8dd	Update api_invoices.class.php	2017-10-07 13:28:04 +02:00
Neil Orley	925a86b2ba	NEW Delete a line of invoice using the REST API Adds the ability to delete a line of an invoice using the REST API Rename a post action with a "verb"	2017-10-06 20:49:58 +02:00
Laurent Destailleur	f9d9642340	FIX #6981	2017-10-06 14:07:28 +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	436ec93084	FIX is_erasable report bad value when thirdparty was not loaded	2017-10-04 03:22:41 +02:00
Laurent Destailleur	a6cf934973	Add log	2017-10-04 02:46:01 +02:00

... 13 14 15 16 17 ...

3289 Commits