5354 Commits

Author	SHA1	Message	Date
Laurent Destailleur	bc1dc1e9f0	FIX #15590 manually	2020-12-02 19:34:04 +01:00
lmarcouiller	c7a31b2458	new widget funnel of prospection	2020-12-02 14:42:56 +01:00
Laurent Destailleur	c8274f13eb	Merge pull request #15582 from Hystepik/develop ... Close #15307 New Widget : Encours dépassé	2020-12-02 14:01:50 +01:00
Scrutinizer Auto-Fixer	6df4954b20	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-12-01 01:41:19 +00:00
Laurent Destailleur	fc91e70e47	Update modFacture.class.php	2020-11-30 18:37:07 +01:00
Laurent Destailleur	00ad6df395	Fight against $_POST	2020-11-30 14:47:07 +01:00
lmarcouiller	00dca7ff9b	NEW : Encours dépassé #15307	2020-11-30 13:01:45 +01:00
Laurent Destailleur	8eacbaaf5f	Merge pull request #15570 from frederic34/strike ... simplify function	2020-11-29 19:10:06 +01:00
Laurent Destailleur	5ad1bb5b20	Merge pull request #15571 from frederic34/patch-14 ... Update mod_codecompta_aquarium.php	2020-11-29 19:08:29 +01:00
Laurent Destailleur	beafcc7853	Fix warning	2020-11-29 16:06:03 +01:00
Frédéric FRANCE	83c60d725a	Update mod_codecompta_aquarium.php	2020-11-28 23:45:32 +01:00
Frédéric FRANCE	3a041eed44	simplify function	2020-11-28 23:42:48 +01:00
Frédéric FRANCE	11a978ca08	simplify function	2020-11-28 23:41:44 +01:00
Frédéric FRANCE	eea9382b57	Update mod_codecompta_aquarium.php	2020-11-28 23:35:27 +01:00
Frédéric FRANCE	f9ef0f4d69	Update mod_codecompta_digitaria.php	2020-11-28 23:33:58 +01:00
Frédéric FRANCE	2f701f4889	Update mod_codecompta_aquarium.php	2020-11-28 23:24:13 +01:00
Frédéric FRANCE	fb871daf14	simplify function	2020-11-28 23:04:05 +01:00
Laurent Destailleur	147a12a922	Fix warning	2020-11-28 15:02:05 +01:00
Laurent Destailleur	df461d319e	Fix warning	2020-11-28 02:12:07 +01:00
Laurent Destailleur	574919de52	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml htdocs/accountancy/bookkeeping/balance.php htdocs/adherents/class/subscription.class.php htdocs/compta/bank/categ.php htdocs/compta/facture/class/facture.class.php htdocs/core/boxes/box_task.php htdocs/core/class/commondocgenerator.class.php htdocs/core/class/interfaces.class.php htdocs/core/lib/project.lib.php htdocs/core/modules/modCategorie.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fichinter/class/fichinterrec.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/install/repair.php htdocs/main.inc.php htdocs/product/price.php htdocs/projet/tasks/time.php htdocs/reception/card.php	2020-11-27 15:45:12 +01:00
Laurent Destailleur	4a5cdd0092	Several fixes in export and repair tool	2020-11-27 15:27:35 +01:00
Laurent Destailleur	250b42f60a	Fix phpcs	2020-11-27 00:37:36 +01:00
Laurent Destailleur	9aa657bc35	Debug v13	2020-11-26 18:48:51 +01:00
Laurent Destailleur	5d0a54c0de	Fix var not defined	2020-11-26 12:07:01 +01:00
Laurent Destailleur	74605cec12	Fix warning	2020-11-25 18:07:52 +01:00
Laurent Destailleur	d17ecbeccd	Fix #15438	2020-11-24 20:56:11 +01:00
Laurent Destailleur	bd0236edeb	Fix #15438	2020-11-24 20:53:42 +01:00
Laurent Destailleur	cf82581a2a	Move module to experimental	2020-11-24 14:06:02 +01:00
Laurent Destailleur	af2eabb24d	Fix warning	2020-11-22 15:06:53 +01:00
Laurent Destailleur	3d2da45f84	Remove warning	2020-11-22 11:36:07 +01:00
Laurent Destailleur	3534555909	Fix setup of scheduled jobs	2020-11-21 14:14:53 +01:00
Laurent Destailleur	95460e6372	Merge pull request #15422 from frederic34/patch-10 ... add optional tag which list all other tags in odt substitutions	2020-11-18 12:44:25 +01:00
Frédéric FRANCE	bf390ceb4d	Update doc_generic_member_odt.class.php	2020-11-17 11:56:11 +01:00
Frédéric FRANCE	fcfd630f84	Update doc_generic_user_odt.modules.php	2020-11-17 11:55:05 +01:00
Laurent Destailleur	6c42535eb2	Maxi debug v13	2020-11-16 12:20:18 +01:00
Frédéric FRANCE	d114c56672	add a tag which list all other tags in odt user	2020-11-15 23:49:16 +01:00
Laurent Destailleur	8e87729040	Merge pull request #15416 from frederic34/patch-25 ... doxygen	2020-11-15 17:06:34 +01:00
Laurent Destailleur	acfee5a0e1	Merge pull request #15415 from frederic34/patch-24 ... doxygen	2020-11-15 17:05:55 +01:00
Laurent Destailleur	041de0843a	Merge pull request #15414 from frederic34/patch-23 ... doxygen	2020-11-15 17:05:39 +01:00
Laurent Destailleur	27f3287ac4	Merge pull request #15413 from frederic34/patch-22 ... doxygen	2020-11-15 17:05:22 +01:00
Laurent Destailleur	c4094357c2	Merge pull request #15412 from frederic34/patch-21 ... doxygen	2020-11-15 17:05:03 +01:00
Laurent Destailleur	a1bdce06f5	Merge pull request #15411 from frederic34/patch-20 ... doxygen	2020-11-15 17:04:45 +01:00
Laurent Destailleur	db357da9a7	Merge pull request #15410 from frederic34/patch-19 ... doxygen	2020-11-15 17:04:17 +01:00
Laurent Destailleur	31c73403c0	Update pdf_eratosthene.modules.php	2020-11-15 17:04:07 +01:00
Laurent Destailleur	d0cf558604	Merge pull request #15409 from frederic34/patch-18 ... doxygen	2020-11-15 17:02:54 +01:00
Laurent Destailleur	ed6204183d	Merge pull request #15408 from frederic34/patch-17 ... doxygen	2020-11-15 17:00:54 +01:00
Laurent Destailleur	011e786996	Update pdf_sepamandate.modules.php	2020-11-15 17:00:37 +01:00
Laurent Destailleur	0db18136a5	Merge pull request #15407 from frederic34/patch-15 ... doxygen	2020-11-15 16:59:47 +01:00
Laurent Destailleur	c0ce41dc0d	Merge pull request #15406 from frederic34/patch-14 ... doxygen	2020-11-15 16:59:25 +01:00
Laurent Destailleur	5c15162c40	Fix warning	2020-11-15 15:10:15 +01:00
Frédéric FRANCE	41906fb5ee	Update pdf_cyan.modules.php	2020-11-14 22:15:05 +01:00
Frédéric FRANCE	92c28efe42	doxygen	2020-11-14 22:12:05 +01:00
Frédéric FRANCE	da0bdd0907	doxygen	2020-11-14 22:04:14 +01:00
Frédéric FRANCE	b994d0d84b	doxygen	2020-11-14 21:26:18 +01:00
Frédéric FRANCE	518ad097d0	Update pdf_sponge.modules.php	2020-11-14 21:21:58 +01:00
Frédéric FRANCE	9075e30a94	doxygen	2020-11-14 21:19:28 +01:00
Frédéric FRANCE	d6afdda8fe	Update pdf_rouget.modules.php	2020-11-14 21:09:02 +01:00
Frédéric FRANCE	0b097c74fa	Update pdf_merou.modules.php	2020-11-14 21:07:34 +01:00
Frédéric FRANCE	84ea018d81	doxygen	2020-11-14 21:05:53 +01:00
Frédéric FRANCE	c12c0a0d2f	Update pdf_strato.modules.php	2020-11-14 20:50:15 +01:00
Frédéric FRANCE	9c258b5dd4	Update pdf_eratosthene.modules.php	2020-11-14 20:46:49 +01:00
Frédéric FRANCE	e1c148a994	doxygen	2020-11-14 20:44:44 +01:00
Frédéric FRANCE	1db8afb4a9	doxygen	2020-11-14 20:40:17 +01:00
Frédéric FRANCE	a2fc7ce8c9	doxygen	2020-11-14 20:37:54 +01:00
Frédéric FRANCE	50e3fffbd8	doxygen	2020-11-14 20:35:52 +01:00
Frédéric FRANCE	d5f93e8c35	Update pdf_typhon.modules.php	2020-11-14 20:26:13 +01:00
Frédéric FRANCE	61d72b53be	doxygen	2020-11-14 20:24:26 +01:00
Frédéric FRANCE	30f89b1216	doxygen	2020-11-14 18:37:05 +01:00
Frédéric FRANCE	0a5e041775	Merge remote-tracking branch 'upstream/develop' into odtformembers	2020-11-14 00:56:21 +01:00
Frédéric FRANCE	4ca3c0aa95	Add odt for members	2020-11-14 00:48:13 +01:00
Laurent Destailleur	8970fbca79	Merge pull request #15397 from frederic34/patch-19 ... can upload odt model for user	2020-11-14 00:39:44 +01:00
Frédéric FRANCE	70f1ed53f8	can upload odt model for user	2020-11-13 22:51:10 +01:00
Frédéric FRANCE	2f3ff6628d	The variable $obj does not seem to be defined ... The variable $obj does not seem to be defined for all execution paths leading up to this point.	2020-11-13 20:51:48 +01:00
Laurent Destailleur	86481d16d0	Clean code	2020-11-13 15:02:49 +01:00
Laurent Destailleur	6d4d3c618d	FIX #15369 and standardize permission "readall"	2020-11-13 09:55:53 +01:00
Laurent Destailleur	754a9778ea	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/list.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/modUser.class.php	2020-11-12 14:17:10 +01:00
Laurent Destailleur	0764cb2abd	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-11-12 14:13:19 +01:00
Laurent Destailleur	02158928cc	FIX #15365 export of extrafields for user and resources	2020-11-12 14:11:59 +01:00
Laurent Destailleur	a168c3fbb1	Remove warnings	2020-11-12 12:33:29 +01:00
Laurent Destailleur	576e1e1de8	Fix pdf crabe	2020-11-11 23:42:24 +01:00
andreubisquerra	d6b5168d12	NEW Receipt Printer module as stable ... I want to propose in the canceled devcamp to set this module as stable. I will present the new TakePOS connector in the devcamp too, and requires this module. What a pity, the devcamp was canceled.	2020-11-10 22:19:46 +01:00
quentin	fb27c98f9c	FIX : handling $heightforinfotot when he's superior to a page height	2020-11-10 09:40:45 +01:00
Scrutinizer Auto-Fixer	f6e3f58fcb	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-11-09 14:18:56 +00:00
Laurent Destailleur	451432d73c	Merge pull request #15139 from dvdwalker/develop ... Update to allow importing extrafileds on Product Supplier Price	2020-11-08 12:40:53 +01:00
Laurent Destailleur	ea4ad24ac5	Fix doc	2020-11-07 02:14:17 +01:00
Laurent Destailleur	1d9aacc7da	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/commoninvoice.class.php htdocs/core/modules/import/import_csv.modules.php htdocs/core/modules/import/import_xlsx.modules.php	2020-11-05 09:51:28 +01:00
jcp	bae05bbe7d	Fix computed import	2020-11-03 18:43:03 +01:00
Frédéric FRANCE	0299d0c9cc	doxygen	2020-11-02 10:50:54 +01:00
Laurent Destailleur	1c15ec9dec	Merge pull request #15258 from frederic34/patch-13 ... Update mod_codeclient_elephant.php	2020-11-02 09:32:08 +01:00
Frédéric FRANCE	802efbe6a7	Update mod_codeclient_elephant.php	2020-11-01 23:30:15 +01:00
Frédéric FRANCE	1ccb5cb2d7	Update mod_codeclient_elephant.php	2020-11-01 23:09:30 +01:00
Frédéric FRANCE	c973faf9a9	Update mod_codeclient_elephant.php	2020-11-01 23:06:35 +01:00
Frédéric FRANCE	cd61e5b0b2	Update modules_societe.class.php	2020-11-01 22:44:09 +01:00
Laurent Destailleur	d6b6cacbe5	Removed warning	2020-11-01 20:02:12 +01:00
Laurent Destailleur	e0ed89c514	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/compta/facture/card.php htdocs/contrat/class/contrat.class.php htdocs/core/actions_addupdatedelete.inc.php htdocs/product/class/product.class.php htdocs/product/price.php htdocs/projet/tasks/time.php	2020-11-01 17:58:41 +01:00
Laurent Destailleur	72160deef7	FIX #14979	2020-11-01 17:01:26 +01:00
Scrutinizer Auto-Fixer	ab25e047c0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer	7f52920716	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 13:32:18 +00:00
dvdwalker	d4d7e85805	Update modProduct.class.php	2020-10-30 08:19:28 -03:00
Laurent Destailleur	ec0c8e0c79	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/lib/security2.lib.php htdocs/core/modules/livraison/doc/pdf_typhon.modules.php htdocs/core/tpl/advtarget.tpl.php	2020-10-30 03:35:40 +01:00
Laurent Destailleur	263b679af4	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/tpl/advtarget.tpl.php	2020-10-30 03:31:04 +01:00
Scrutinizer Auto-Fixer	208740c9c4	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-28 16:49:52 +00:00
Scrutinizer Auto-Fixer	a2a9c51e50	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-27 18:46:07 +00:00
Laurent Destailleur	ec6c735d89	Clean code	2020-10-27 19:44:15 +01:00
Laurent Destailleur	f7de9333bb	Doxygen	2020-10-27 19:29:42 +01:00
Alfredo Altamirano	1b82b6af4d	FIX #15111 Fix special characters output in PDF	2020-10-25 22:17:02 -06:00
Laurent Destailleur	8578a7cd7c	Fix regressions	2020-10-25 17:02:25 +01:00
Laurent Destailleur	cd4d738a56	Merge branch 'translateModLivraison2ModDelivery' of ... https://github.com/orebd/dolibarr into develop # Conflicts: # htdocs/install/mysql/migration/12.0.0-13.0.0.sql	2020-10-25 16:01:18 +01:00
Laurent Destailleur	4d9c8e2225	Merge pull request #15124 from frederic34/retrieve ... retrieve the spelling	2020-10-25 14:48:51 +01:00
dvdwalker	8b91b5527a	Update to allow importing extrafileds on Product Supplier Price	2020-10-24 11:13:44 -03:00
Frédéric FRANCE	96e80f116a	fix unknown property db	2020-10-23 22:06:23 +02:00
Frédéric FRANCE	ae3228b9e0	retrieve the spelling 🎉	2020-10-23 20:08:35 +02:00
Frédéric FRANCE	9a470fa42d	replace deprecated	2020-10-22 22:50:03 +02:00
Laurent Destailleur	a83131276d	Merge pull request #15079 from FHenry/dev_addtranslationkeyPDFInvoiceSituation ... new: add PDFInvoiceSituation translation key for PDF title	2020-10-22 15:49:25 +02:00
Laurent Destailleur	bf6ec35478	Merge pull request #15095 from joseplluis/patch-9 ... FIX input name in MRP mask const	2020-10-22 15:45:36 +02:00
Josep Lluís	1221cc854d	FIX input name in MRP mask const ... input name in MRP mask const was wrong	2020-10-22 15:23:45 +02:00
Frédéric FRANCE	f500076247	remove warning	2020-10-21 21:21:30 +02:00
Frédéric FRANCE	4873794dc0	doxygen	2020-10-21 21:08:33 +02:00
Frédéric FRANCE	06325f9422	doxygen	2020-10-21 21:00:50 +02:00
Frédéric FRANCE	81f6a7abb6	can add a driver for printing in module	2020-10-21 20:18:06 +02:00
Florian HENRY	d347af385b	new: add PDFInvoiceSituation translation key for PDF title	2020-10-21 13:47:40 +02:00
Laurent Destailleur	e3552e7e02	Clean code	2020-10-16 20:17:54 +02:00
jove@bisquerra.com	f90b236e0f	Change the tag char for security reasons in 'Receipt Printer' module	2020-10-15 23:44:13 +02:00
Laurent Destailleur	64b1a31e45	Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType ... NEW : Nature of product is now a dictionay	2020-10-15 21:07:42 +02:00
Laurent Destailleur	a1913995df	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/expensereport/class/expensereport.class.php	2020-10-15 21:05:00 +02:00
Laurent Destailleur	e7992131ec	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php	2020-10-15 21:00:49 +02:00
Laurent Destailleur	6277422115	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/contrat/class/contrat.class.php htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/expensereport/class/expensereport.class.php	2020-10-15 20:38:32 +02:00
ATM john	b9cbd84d4e	Fix page break	2020-10-15 09:30:48 +02:00
Florian HENRY	109d1ab801	Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType	2020-10-15 08:25:46 +02:00
Laurent Destailleur	0908ac5867	Fix phpcs	2020-10-14 20:18:07 +02:00
Florian HENRY	7d09f22afa	add correct import and dict edition	2020-10-14 16:39:42 +02:00
Laurent Destailleur	4a3a3190ea	Standardize pdf templates	2020-10-14 01:46:49 +02:00
Laurent Destailleur	75997bb8f5	Minor fixes	2020-10-12 14:01:15 +02:00
Laurent Destailleur	726fd1b631	Merge pull request #11227 from aspangaro/10.0_intracommreport ... NEW module Intracomm report	2020-10-12 13:35:58 +02:00
Laurent Destailleur	a1dd922394	Update modProduct.class.php	2020-10-12 13:04:10 +02:00
Florian HENRY	cea6eb279f	add immport packaging supplier quantity	2020-10-12 11:26:09 +02:00
Laurent Destailleur	b36b9170b2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-10 15:45:22 +02:00
Laurent Destailleur	437eead694	Fix bad permission	2020-10-10 15:45:04 +02:00
Philippe GRAND	ba674d09d3	add some translations	2020-10-10 14:45:58 +02:00
Philippe GRAND	094dbc1265	add some translations	2020-10-10 14:38:57 +02:00
Philippe GRAND	37b6a43c5c	add some translations	2020-10-10 14:30:22 +02:00
Alexandre SPANGARO	b3b37dd9ee	Fix sticklerCI	2020-10-09 09:32:50 +02:00
Alexandre SPANGARO	ca7ad35342	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-10-09 06:39:42 +02:00
Laurent Destailleur	0628c92bdb	Merge pull request #14960 from rabib-metroworks/import-po ... NEW ADDED IMPORT TOOL FOR PO	2020-10-08 19:29:53 +02:00
Aurélien	b6283c1a5d	Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery	2020-10-08 16:19:10 +02:00
quentin	77552c6508	Merge branch 'NEW_helper_functions' of github.com:atm-quentin/dolibarr into NEW_helper_functions	2020-10-08 10:50:08 +02:00
quentin	7591ec6cf6	FIX style	2020-10-08 10:49:29 +02:00
stickler-ci	f5b34370b6	Fixing style errors.	2020-10-08 08:34:40 +00:00
quentin	fe8d7f7f1b	missing public parameter	2020-10-08 10:32:16 +02:00
quentin	bf97d2a50f	NEW helper functions for export with phpspreadsheet	2020-10-08 10:26:30 +02:00