5393 Commits

Author	SHA1	Message	Date
Laurent Destailleur	4598538b42	Prepare PDF templates to use 2 languages for titles	2020-01-21 01:55:00 +01:00
Laurent Destailleur	d6e81c5da4	Fix var not defined	2020-01-21 00:20:18 +01:00
Laurent Destailleur	65fef47bdb	Enable new pdf templates as stable	2020-01-20 01:05:30 +01:00
Scrutinizer Auto-Fixer	8744f6ab7b	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-18 15:17:07 +00:00
Scrutinizer Auto-Fixer	0aa156db78	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-16 01:54:00 +00:00
Laurent Destailleur	d07fa80a28	Removed export driver using phpexcel.	2020-01-15 21:09:11 +01:00
Laurent Destailleur	2c40e4be94	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-15 20:13:45 +01:00
Laurent Destailleur	a68da82bec	Code comment of export	2020-01-15 20:11:04 +01:00
Laurent Destailleur	98eda68afb	Fix linkg to public notes	2020-01-15 19:49:45 +01:00
Laurent Destailleur	3f79c00542	Merge branch 'develop' into actioncomm_category	2020-01-15 14:21:06 +01:00
Laurent Destailleur	34829644ed	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/projet/tasks/time.php	2020-01-15 13:38:28 +01:00
Laurent Destailleur	8e269c5e64	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/modules/modSociete.class.php htdocs/filefunc.inc.php	2020-01-15 13:19:37 +01:00
Laurent Destailleur	5772dce460	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions.lib.php	2020-01-15 12:09:21 +01:00
gauthier	5455130a03	FIX : We want to be able to import data for extrafields of entity 0 too	2020-01-13 16:15:22 +01:00
Laurent Destailleur	56fb6dce61	FIX #12756	2020-01-13 15:38:46 +01:00
Laurent Destailleur	f9e3164c6e	Merge pull request #12783 from frederic34/patch-14 ... NEW upload odt templates for shipments	2020-01-13 13:42:07 +01:00
Laurent Destailleur	ab1a56c881	Merge pull request #12781 from frederic34/patch-11 ... NEW upload odt models for invoices	2020-01-13 13:41:49 +01:00
Laurent Destailleur	4f3f933ab9	Merge pull request #12780 from frederic34/patch-8 ... NEW upload odt models for thirdparties	2020-01-13 13:41:37 +01:00
Laurent Destailleur	3017d2ebe4	Merge pull request #12805 from OPEN-DSI/new-export-agenda-project-ref ... NEW add project ref in events export	2020-01-13 11:50:39 +01:00
simicar29	7e29e57aff	Avoid adding unsubscribed contacts in mailing list ... Add an sql criterion to exclude unsubscribed email adresses from count of contacts (function getNbOfRecipients) and avoid their inclusion in mailing lists (function add_to_target)	2020-01-07 16:13:48 +01:00
VESSILLER	c0751a69e4	NEW add project ref in events export	2020-01-07 10:56:46 +01:00
Laurent Destailleur	afd32135f2	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/takepos/invoice.php	2020-01-01 22:37:13 +01:00
Laurent Destailleur	85d3b424f7	FIX: Substitution of login into link is wrong.	2020-01-01 22:27:08 +01:00
Laurent Destailleur	eae0800021	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-01 11:24:10 +01:00
Laurent Destailleur	3825e9af06	FIX logo not found in some cases	2020-01-01 03:00:10 +01:00
Laurent Destailleur	15f1153e82	FIX Avoid line feed when 100%	2019-12-31 17:22:12 +01:00
Laurent Destailleur	76052b8bb4	FIX Avoid line feed when 100%	2019-12-31 17:19:49 +01:00
Frédéric FRANCE	530eeffed7	NEW upload odt templates for sendings	2019-12-31 14:30:57 +01:00
Frédéric FRANCE	a7a474d032	Update doc_generic_contract_odt.modules.php	2019-12-31 14:28:14 +01:00
Frédéric FRANCE	57a5416cbc	Update doc_generic_proposal_odt.modules.php	2019-12-31 14:20:39 +01:00
Frédéric FRANCE	ee7fe66749	Update doc_generic_order_odt.modules.php	2019-12-31 14:19:31 +01:00
Frédéric FRANCE	596e2ccefc	Update doc_generic_invoice_odt.modules.php	2019-12-31 14:15:17 +01:00
Frédéric FRANCE	0c58df51d9	Update doc_generic_odt.modules.php	2019-12-31 14:14:30 +01:00
Frédéric FRANCE	b6f7394959	NEW upload odt models for invoices	2019-12-31 14:13:10 +01:00
Frédéric FRANCE	95335f402e	NEW upload odt models for thirdparties	2019-12-31 14:03:08 +01:00
Frédéric FRANCE	90235d0528	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-31 13:57:40 +01:00
stickler-ci	ce3e658608	Fixing style errors.	2019-12-31 07:36:40 +00:00
Alexandre SPANGARO	c664a1e42d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2019-12-31 08:34:37 +01:00
Laurent Destailleur	9a08a6bf6d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/categories/traduction.php htdocs/compta/facture/class/facture.class.php htdocs/contact/card.php htdocs/core/modules/modSociete.class.php htdocs/fourn/class/fournisseur.product.class.php htdocs/langs/en_US/products.lang htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php htdocs/margin/productMargins.php htdocs/margin/tabs/productMargins.php htdocs/margin/tabs/thirdpartyMargins.php	2019-12-23 14:13:26 +01:00
Laurent Destailleur	2df9df2db0	Debug v11	2019-12-23 12:24:27 +01:00
Frédéric FRANCE	3d19e1321b	NEW upload odt models for proposal	2019-12-19 11:10:55 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer	455178ff73	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-18 14:20:36 +00:00
Alexandre SPANGARO	3fb72c349f	Fix language traduction on import/export tools	2019-12-18 03:25:19 +01:00
Frédéric FRANCE	b6c9de3928	upload odt models for order	2019-12-17 14:49:18 +01:00
Laurent Destailleur	6e2e02fd40	Look and feel v11	2019-12-16 21:06:32 +01:00
Laurent Destailleur	1af67a4336	Merge pull request #12713 from frederic34/doxygen_warning ... doxygen	2019-12-16 19:02:10 +01:00
Laurent Destailleur	44c967f1cc	Merge pull request #12716 from Dolibarr/scrutinizer-patch-19 ... Scrutinizer Auto-Fixes	2019-12-16 19:01:53 +01:00
Laurent Destailleur	c3cd6ad1af	Fix example	2019-12-16 13:10:57 +01:00
Scrutinizer Auto-Fixer	c8baaa2995	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-16 12:06:25 +00:00
Frédéric FRANCE	9e4fb8d4fe	doxygen	2019-12-15 10:02:20 +01:00
Frédéric FRANCE	8c7f0e669b	Update mod_chequereceipt_mint.php	2019-12-14 16:13:48 +01:00
Frédéric FRANCE	440b846e9a	Update mod_chequereceipt_mint.php	2019-12-14 16:12:38 +01:00
Frédéric FRANCE	ddc827e48e	Update mod_chequereceipt_thyme.php	2019-12-14 16:11:27 +01:00
Frédéric FRANCE	f15d65c2b9	doxygen	2019-12-14 16:09:48 +01:00
Laurent Destailleur	838633d0de	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/filecheck.php htdocs/api/class/api_setup.class.php htdocs/compta/facture/card.php htdocs/compta/stats/index.php htdocs/core/actions_massactions.inc.php htdocs/install/upgrade2.php htdocs/loan/card.php htdocs/loan/document.php htdocs/loan/info.php htdocs/loan/note.php htdocs/loan/schedule.php htdocs/product/list.php htdocs/ticket/card.php htdocs/user/class/user.class.php	2019-12-14 14:53:49 +01:00
Laurent Destailleur	a0d9a7a970	Merge pull request #12704 from frederic34/patch-20 ... The property db does not exist on mod_arctic	2019-12-14 13:55:08 +01:00
Laurent Destailleur	835d22f556	Merge branch 'develop' into doxygen_todo	2019-12-14 13:46:40 +01:00
Frédéric FRANCE	57055bad03	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-13 14:36:00 +01:00
Frédéric FRANCE	a3dd454f86	The property db does not exist on mod_arctic	2019-12-13 08:00:34 +01:00
Frédéric FRANCE	a63caf38d3	The variable $conf seems to be never defined	2019-12-12 20:39:28 +01:00
Laurent Destailleur	a612aefab7	Fix HTML5	2019-12-12 11:11:08 +01:00
Laurent Destailleur	ce47de453e	Fix HTML5	2019-12-12 10:31:08 +01:00
Frédéric FRANCE	12f84d8254	doxygen	2019-12-11 23:04:27 +01:00
Mistral Oz - LWEP	b92ec604ec	New model "Excel 2007" : first col at wrong position ... The first column start at id 0 instead of id 1. At id 0, the first column move at Z position. Documentation : https://phpspreadsheet.readthedocs.io/en/latest/topics/migration-from-PHPExcel/#column-index-based-on-1	2019-12-10 18:25:30 +01:00
Laurent Destailleur	dfeca5fae8	Fix phpcs	2019-12-09 17:42:38 +01:00
Laurent Destailleur	a77dc75bd4	Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template	2019-12-09 16:05:23 +01:00
Laurent Destailleur	d73bd3ee9a	Fix a supplier ref is mandatory for import	2019-12-06 18:43:13 +01:00
Laurent Destailleur	ed4f04f90a	Fix a supplier ref is mandatory for import	2019-12-06 18:41:22 +01:00
Frédéric FRANCE	4c5c6b6ff1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-03 17:56:43 +01:00
Laurent Destailleur	606a13898c	Merge pull request #12394 from mapiolca/patch-15 ... Fix problem of display photo in the model	2019-12-03 16:16:57 +01:00
Laurent Destailleur	41a176ce72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/remx.php htdocs/core/modules/modStripe.class.php htdocs/product/stock/replenish.php htdocs/stripe/payout.php	2019-12-03 13:58:15 +01:00
Laurent Destailleur	b1f2495771	Merge pull request #12598 from frederic34/patch-15 ... The property db does not exist on mod_livraison_saphir	2019-12-03 13:26:16 +01:00
Laurent Destailleur	87aaa5b11d	Merge pull request #12597 from frederic34/patch-14 ... The property db does not exist on mod_supplier_proposal_saphir	2019-12-03 13:26:03 +01:00
Laurent Destailleur	9400d44f83	Merge pull request #12596 from frederic34/patch-13 ... The property db does not exist on mod_reception_moonstone	2019-12-03 13:25:51 +01:00
Laurent Destailleur	a56d4407ca	Merge branch 'develop' into patch-11	2019-12-03 13:25:19 +01:00
Scrutinizer Auto-Fixer	36a74cd160	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-03 10:17:29 +00:00
ptibogxiv	b67fb8be02	Fix stripe menu	2019-12-03 00:14:05 +01:00
Laurent Destailleur	32a539a8c0	Update website templates	2019-12-02 09:19:05 +01:00
Frédéric FRANCE	0b37d54841	The property db does not exist on mod_livraison_saphir	2019-12-01 20:58:45 +01:00
Frédéric FRANCE	5d9901bf59	The property db does not exist on mod_supplier_proposal_saphir	2019-12-01 20:57:14 +01:00
Frédéric FRANCE	318ba895e5	The property db does not exist on mod_reception_moonstone	2019-12-01 20:55:22 +01:00
Frédéric FRANCE	c780838e34	The property db does not exist on mod_propale_saphir	2019-12-01 20:50:18 +01:00
Laurent Destailleur	5cb014435b	Try better fix for #12567	2019-12-01 19:29:53 +01:00
Frédéric FRANCE	1d0900445b	The variable $letter does not seem... ... The variable $letter does not seem to be defined for all execution paths	2019-12-01 18:52:50 +01:00
Frédéric FRANCE	25ed2b930f	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-01 16:10:37 +01:00
Laurent Destailleur	3eec2430eb	Merge pull request #12585 from atm-john/develop_factoring_token_usage ... Factoring token usage	2019-12-01 11:37:30 +01:00
Laurent Destailleur	790fdc881c	# WARNING: head commit changed in the meantime ... Restore file for travis	2019-12-01 10:50:56 +01:00
Laurent Destailleur	6bf3af5d83	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 ... Conflicts: htdocs/compta/tva/index.php htdocs/core/lib/pdf.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/tpl/objectline_view.tpl.php htdocs/margin/productMargins.php htdocs/margin/tabs/productMargins.php	2019-12-01 10:30:22 +01:00
ATM John BOTELLA	773f823748	factoring token usage	2019-12-01 10:20:11 +01:00
Maxime Kohlhaas	edb8bcb598	Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME	2019-11-30 22:58:32 +01:00
Laurent Destailleur	eed8f242b8	Update demo	2019-11-29 10:23:18 +01:00
Laurent Destailleur	1636d341c7	Debug module BOM ... Enhance demo data for TakePOS	2019-11-28 15:18:14 +01:00
Scrutinizer Auto-Fixer	5f99e25c45	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-28 11:36:20 +00:00
Frédéric FRANCE	b2912e688b	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-27 22:54:05 +01:00
Frédéric FRANCE	32aca5f186	Update pdf_standard.class.php	2019-11-26 19:52:10 +01:00
Laurent Destailleur	b0b579bdbf	Fix phpcs	2019-11-26 09:13:35 +01:00
Frédéric FRANCE	4c4ae5b6e1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-26 08:10:40 +01:00
Laurent Destailleur	61f414488a	Fix translation	2019-11-24 18:34:07 +01:00
Laurent Destailleur	712ae48e4e	Fix default setup	2019-11-24 18:07:38 +01:00
Alexandre SPANGARO	2f064567ef	NEW Add shipment widget	2019-11-21 07:50:44 +01:00
Frédéric FRANCE	2e5f539b2a	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-18 17:45:52 +01:00
Laurent Destailleur	ae0fdf014f	Debug email collector. Missing unique key. Fix initial setup.	2019-11-18 11:55:22 +01:00
Frédéric FRANCE	6784ea9fae	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-16 09:21:57 +01:00
Laurent Destailleur	1f5bea01f5	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/fourn/class/fournisseur.product.class.php htdocs/product/fournisseurs.php htdocs/user/card.php	2019-11-14 21:30:16 +01:00
Laurent Destailleur	80b3e27341	Fix bad name of constant	2019-11-14 14:23:48 +01:00
Laurent Destailleur	7e0ae4bf0e	FIX The pdf templates were using the large logo making PDF too large	2019-11-14 14:17:22 +01:00
Scrutinizer Auto-Fixer	ddcc14dc16	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-14 11:09:15 +00:00
Frédéric FRANCE	a3e092b227	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-14 09:21:26 +01:00
Laurent Destailleur	171b94fc5c	Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 ... Scrutinizer Auto-Fixes	2019-11-14 08:50:24 +01:00
Laurent Destailleur	86094613e8	Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 ... Scrutinizer Auto-Fixes	2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer	b40ecc3933	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer	ac40dd8bbe	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer	8a527631a0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:02 +00:00
Frédéric FRANCE	05ab4f79ef	categories for actioncomm	2019-11-13 18:44:11 +01:00
Scrutinizer Auto-Fixer	c66bce7ec6	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 17:31:18 +00:00
Scrutinizer Auto-Fixer	038bda254d	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-11 22:59:36 +00:00
Laurent Destailleur	2ccef4e469	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php	2019-11-11 19:10:35 +01:00
Laurent Destailleur	5b6ace387e	Debug BOM and MO module	2019-11-09 19:47:49 +01:00
BENKE Charlene	53fd8328bc	add certificate if present on document folder	2019-11-09 15:20:36 +01:00
Pierre Ardoin	88fb094a78	Fix problem of display photo in the model ... Fix a problem with photo in the model : Before : Check in the current entity the product's repertory to find a photo Now : Check all entities product's repertories to find a photo	2019-11-08 22:02:30 +01:00
Laurent Destailleur	8f35c24b62	Add quick hack by hidden const as solution when numbering is locked.	2019-11-08 16:37:25 +01:00
Laurent Destailleur	e513917d12	Fix phpcs	2019-11-08 11:34:14 +01:00
Laurent Destailleur	3b44760e65	FIX #12356	2019-11-07 14:10:07 +01:00
Laurent Destailleur	f84087ba70	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-07 14:08:01 +01:00
Laurent Destailleur	1fa61077a0	FIX #12356	2019-11-07 14:07:50 +01:00
Scrutinizer Auto-Fixer	0b406172fd	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-07 11:59:59 +00:00
Laurent Destailleur	7c4942b7be	Fix debug BOM/MO	2019-11-05 20:14:33 +01:00
Laurent Destailleur	84a8d4e7cb	Debug BOM/MO	2019-11-05 19:18:12 +01:00
Laurent Destailleur	c0daa1e5d3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-05 10:11:49 +01:00
Laurent Destailleur	b4d72e3e96	Fix link to setup of social network module	2019-11-05 10:00:46 +01:00
Frédéric FRANCE	d035aefd40	config file doesn't exists	2019-11-04 21:58:40 +01:00
Laurent Destailleur	1aef1c60dd	Merge pull request #11867 from frederic34/socialnetworks ... NEW add socialnetworks dictionary	2019-11-04 21:10:22 +01:00
Laurent Destailleur	b0ea276233	Debug MO module	2019-11-04 14:13:36 +01:00
Frédéric FRANCE	872f58f261	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-11-03 21:48:24 +01:00
Laurent Destailleur	e087ac434d	Merge pull request #12283 from frederic34/socid ... replace deprecated user->societe_id by user->socid	2019-11-02 13:34:21 +01:00
Laurent Destailleur	58ffb73627	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-02 12:59:49 +01:00
Laurent Destailleur	45c77b4560	Renaming some libelle into label	2019-11-02 12:59:38 +01:00
Laurent Destailleur	25e64b0610	Merge branch 'develop' into socid	2019-11-02 12:01:06 +01:00
Laurent Destailleur	68691ddd8a	Merge pull request #12265 from grandoc/new_branch_30_10_2019 ... add comment	2019-11-02 11:49:28 +01:00
Frédéric FRANCE	dbed10a701	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-01 21:39:20 +01:00
Laurent Destailleur	b8803fa8df	Work on MO	2019-10-31 22:56:08 +01:00
Laurent Destailleur	716c2bb531	Work on MO	2019-10-31 22:46:34 +01:00
Laurent Destailleur	af09c77a0c	Fix phpcs	2019-10-31 22:15:18 +01:00
Laurent Destailleur	c215d534fc	Fix phpcs	2019-10-31 21:16:41 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Laurent Destailleur	b296f62671	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2019-10-31 02:36:31 +01:00
Laurent Destailleur	645390c990	Work on BOM templates	2019-10-31 02:36:16 +01:00
Frédéric FRANCE	f7747ed00a	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-30 20:06:43 +01:00
stickler-ci	ed9a136211	Fixing style errors.	2019-10-30 08:58:19 +00:00
Philippe GRAND	445d09cf8a	add comment	2019-10-30 09:50:06 +01:00
Philippe GRAND	a80243e528	add comment	2019-10-30 09:48:34 +01:00
Laurent Destailleur	6a01132fdb	Merge pull request #12210 from grandoc/new_branch_24_10_2019 ... add some comment	2019-10-30 03:17:21 +01:00
Laurent Destailleur	66a288a343	Merge pull request #12235 from frederic34/scopeindent ... clean indent	2019-10-30 02:57:59 +01:00
Laurent Destailleur	bc3f088f50	Enhance modulebuilder ... Work on MO	2019-10-30 01:35:41 +01:00
Laurent Destailleur	66337ec234	NEW Add widgets for BOMs and MOs	2019-10-30 00:36:47 +01:00
Frédéric FRANCE	1ba9612f12	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-27 17:03:50 +01:00
Frédéric FRANCE	8f6d38ee82	clean indent	2019-10-27 17:01:23 +01:00
Laurent Destailleur	afa3ed499f	Can export BOMs	2019-10-27 15:56:20 +01:00
Frédéric FRANCE	a43e6f96b5	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-25 08:12:54 +02:00
Philippe GRAND	5e44d63ec0	Merge remote-tracking branch 'upstream/develop' into new_branch_24_10_2019	2019-10-24 16:24:17 +02:00
Laurent Destailleur	88e848e346	FIX Extrafields missing in export of expense report	2019-10-24 16:00:10 +02:00
Laurent Destailleur	15609e319f	FIX Extrafields missing in export of expense report	2019-10-24 15:57:34 +02:00
Philippe GRAND	ac839204d7	add some comment	2019-10-24 15:12:20 +02:00
Philippe GRAND	ffa5c8cbc0	add some comment	2019-10-24 15:10:05 +02:00
stickler-ci	3fb0b1ac73	Fixing style errors.	2019-10-24 13:07:19 +00:00
Philippe GRAND	480e21b88a	add some comment	2019-10-24 15:06:56 +02:00
stickler-ci	9eb0385a88	Fixing style errors.	2019-10-24 13:02:34 +00:00
Philippe GRAND	f1db8e6f03	add some comment	2019-10-24 15:02:37 +02:00
stickler-ci	8a7360dd32	Fixing style errors.	2019-10-24 12:59:20 +00:00
Philippe GRAND	96ab43d495	add some comment	2019-10-24 14:58:15 +02:00
Laurent Destailleur	f23804a091	FIX #12152	2019-10-23 03:00:19 +02:00
Laurent Destailleur	fea12076ee	FIX #12152	2019-10-22 20:24:52 +02:00
Laurent Destailleur	c4be61c55c	FIX Better compatible fix for the trouble of weight / size units ... Conflicts: htdocs/core/class/html.form.class.php htdocs/product/card.php	2019-10-22 18:42:59 +02:00
Laurent Destailleur	e7e9898e0d	FIX Better compatible fix for the trouble of weight / size units	2019-10-22 18:36:36 +02:00
Philippe GRAND	a0303e903a	internationalization	2019-10-21 09:53:42 +02:00
Philippe GRAND	db22cdb8ea	internationalization	2019-10-21 09:43:34 +02:00
Frédéric FRANCE	86f22c4563	do not ignore lines with mix od tabs and spaces	2019-10-20 17:17:22 +02:00
Frédéric FRANCE	9ec7836387	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-20 16:37:18 +02:00
Laurent Destailleur	5a4960f7ae	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/takepos/takepos.php	2019-10-20 15:30:28 +02:00
Laurent Destailleur	becd3f7d2f	FIX Missing status and paid flag in export or expense report	2019-10-18 15:35:25 +02:00
Philippe GRAND	a07ab341f8	Standardization	2019-10-18 13:00:31 +02:00
Philippe GRAND	41d2cb2c29	Standardization	2019-10-18 12:56:40 +02:00
Philippe GRAND	f43d51bfec	Standardization	2019-10-18 12:51:49 +02:00
Philippe GRAND	731f4587e2	Merge remote-tracking branch 'origin/new_branch_18_10_2019' into new_branch_18_10_2019	2019-10-18 12:44:40 +02:00
Philippe GRAND	18b183f516	Standardization	2019-10-18 12:43:25 +02:00
stickler-ci	0c61e798a6	Fixing style errors.	2019-10-18 09:42:15 +00:00
Philippe GRAND	3b56d91727	Standardization	2019-10-18 11:41:18 +02:00
Frédéric FRANCE	f4540dddb8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-17 20:24:04 +02:00
Laurent Destailleur	de396dc9b3	Clean code for order of modules	2019-10-17 19:21:30 +02:00
Laurent Destailleur	87ec1de78e	Start to work on solution to sort permissions by module	2019-10-17 18:43:07 +02:00
Laurent Destailleur	40fdcfac7e	Merge branch 'develop' into 10.0_closure2	2019-10-17 18:16:57 +02:00
Laurent Destailleur	f85899742b	Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen ... Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-17 17:48:42 +02:00
Laurent Destailleur	f71423b3fd	Merge pull request #12160 from grandoc/new_branch_17_10_2019 ... Internationalization	2019-10-17 17:42:44 +02:00
Philippe GRAND	2efeeb0ad8	Internationalization	2019-10-17 14:47:03 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
TuxGasy	43ce1543d8	Fix width unit label in product import	2019-10-16 17:37:20 +02:00
Philippe GRAND	10fd472392	internationalization	2019-10-16 15:59:08 +02:00
Philippe GRAND	cd825ba4be	internationalization	2019-10-16 15:46:46 +02:00
Laurent Destailleur	2aa594de9d	Merge pull request #12124 from c3do/patch-1 ... New: Set a pricing rule by default for new clean installation	2019-10-16 13:25:44 +02:00
Laurent Destailleur	d7871c4971	Merge pull request #12132 from grandoc/new_branch_15_10_2019 ... Internationalization	2019-10-16 13:24:10 +02:00
Laurent Destailleur	e07e01580d	Replace deprecated code with new one	2019-10-16 03:34:32 +02:00
Laurent Destailleur	b0de030f3e	phpcs	2019-10-16 02:05:47 +02:00
Laurent Destailleur	ffc4820970	Fix counter of BOM	2019-10-16 02:05:23 +02:00
Frédéric FRANCE	d1d9b1ed85	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-15 09:39:57 +02:00
Laurent Destailleur	fb3d20107c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/exports/export.php htdocs/filefunc.inc.php	2019-10-15 03:51:57 +02:00
stickler-ci	30099a821b	Fixing style errors.	2019-10-14 19:39:00 +00:00
Philippe GRAND	6761e1ef33	Internationalization	2019-10-14 21:38:21 +02:00
Philippe GRAND	7ce5ddbf02	Internationalization	2019-10-14 21:25:43 +02:00
Laurent Destailleur	07bb83a96d	Merge pull request #12113 from aspangaro/10.0_p25 ... Remove a duplicate line	2019-10-14 21:04:22 +02:00
Laurent Destailleur	4941a99cc7	Merge pull request #12126 from grandoc/new_branch_14_10_2019 ... add missing translation	2019-10-14 20:53:28 +02:00
Laurent Destailleur	5a55997540	Update pdf_eratosthene.modules.php	2019-10-14 20:53:18 +02:00
Laurent Destailleur	5c4edad0d4	Merge pull request #12105 from grandoc/new_branch_12_10_2019 ... more internationalization	2019-10-14 20:37:50 +02:00
Frédéric FRANCE	2351750d2b	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-14 19:02:46 +02:00
Philippe GRAND	fd90ebe63b	add missing translation	2019-10-14 15:57:29 +02:00
Philippe GRAND	e326c23245	add missing translation	2019-10-14 15:48:24 +02:00
Cédric	44476afdac	FIX: No pricing rule on new clean installation ... There is no pricing rule on new fresh installation of Dolibarr. I think the pricing rule "PRODUCT_PRICE_UNIQ" should be set by default because it is needed to update a product through API REST.	2019-10-14 15:35:04 +02:00
Laurent Destailleur	a33fb47777	Work on MO module	2019-10-14 12:10:14 +02:00
Alexandre SPANGARO	e50d32dc00	Remove a duplicate line	2019-10-13 13:20:45 +02:00
Alexandre SPANGARO	499eb87173	lang file for holidays is holiday	2019-10-13 08:20:37 +02:00
Frédéric FRANCE	d9ba09bec1	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-12 19:02:24 +02:00
Philippe GRAND	33efd77fc7	more internationalization	2019-10-12 12:10:33 +02:00
Frédéric FRANCE	9f59656589	fix typo inspired by grandoc	2019-10-11 23:08:33 +02:00
Laurent Destailleur	2fa3b23cf1	Fix missing price level field	2019-10-11 19:36:36 +02:00
Laurent Destailleur	f334180cb8	Merge pull request #12072 from OPEN-DSI/new-categorie-import-parent ... NEW add parent category id or label in import category module	2019-10-11 17:33:28 +02:00
Laurent Destailleur	fa928f7dc3	Update modCategorie.class.php	2019-10-11 17:33:13 +02:00
Frédéric FRANCE	367ef4acaf	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-11 16:44:25 +02:00
Laurent Destailleur	a0f918c85a	Merge pull request #12094 from grandoc/new_branch_11_10_2019 ... fix some translations	2019-10-11 16:21:06 +02:00
VESSILLER	2fb776ee34	NEW add new rule fetchidfromcodeandlabel for categories import	2019-10-11 11:57:11 +02:00
Philippe GRAND	25b9be9de7	update code	2019-10-11 10:19:58 +02:00
Frédéric FRANCE	03bbfc6ad9	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-10 23:24:50 +02:00
Frédéric FRANCE	9a2fabff6f	doxygen	2019-10-10 18:42:29 +02:00
Laurent Destailleur	b34cbfad74	Rename const	2019-10-10 15:23:45 +02:00
Laurent Destailleur	d9a0dc2986	Fix trans	2019-10-10 15:20:44 +02:00
Laurent Destailleur	aebae5ff83	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/margins.lang htdocs/user/class/user.class.php	2019-10-10 10:37:17 +02:00
VESSILLER	d77f7556d8	NEW add parent category id or label in import category module	2019-10-09 16:00:14 +02:00
Laurent Destailleur	9f4aadae18	Missing Nature, Duration and Type fields in export of products	2019-10-09 02:05:20 +02:00
Frédéric FRANCE	f253315c8d	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 18:30:58 +02:00
Laurent Destailleur	138ac0d524	Merge pull request #12063 from laudeco/feature/export_user_bank_account ... NEW Add bank data of user into the expense report exports	2019-10-08 15:19:46 +02:00
Laurent Destailleur	651dec8dc2	Doxygen	2019-10-08 11:27:52 +02:00
Laurent Destailleur	43a70e5548	Clean code to use the new $extrafields->attributes array	2019-10-08 09:28:50 +02:00
Laurent De Coninck	c8fb1e852c	export some other fields on the expense reports ... When the user requests the export of the expense reports, some fields were missing such as the bank account information of the user. This PR adds the support of all those fields on the expense report export. Now when you export the expense report you have : * The bank name * The bank code * The IBAN * The BIC * The owner * The owner address	2019-10-08 08:51:09 +02:00
Frédéric FRANCE	b78187c1eb	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 00:07:27 +02:00
Laurent Destailleur	51be0fad99	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-10-07 20:52:39 +02:00
Laurent Destailleur	bb72efefc5	Fix phpcs	2019-10-07 20:52:27 +02:00
Laurent Destailleur	e5026157e3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop	2019-10-07 20:49:30 +02:00
Laurent Destailleur	539f4355c3	Try to fix stickler	2019-10-07 20:48:44 +02:00
Laurent Destailleur	156eb7fa61	Merge branch '10.0' into hotfix/12041-security-generate-password	2019-10-07 20:22:19 +02:00
Laurent De Coninck	2ba8506608	validate the 0 as min value consecutive; meaning not take that rule into account	2019-10-07 17:53:23 +02:00
Laurent Destailleur	035da6a711	Merge pull request #11951 from aspangaro/11.0_accountancy_portal ... NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area	2019-10-07 14:24:22 +02:00
Laurent Destailleur	12d243b8d4	FIX #12040	2019-10-07 13:13:46 +02:00
Laurent Destailleur	71e922635b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-10-07 12:57:52 +02:00
Laurent Destailleur	7015e71105	FIX #12041	2019-10-07 12:53:32 +02:00
Laurent Destailleur	e7aa78cb4a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-10-07 12:37:20 +02:00
Laurent Destailleur	23de8694fa	Fix module files	2019-10-07 12:37:01 +02:00
Laurent Destailleur	f4b752ee81	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/import/import_csv.modules.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/core/modules/modProduct.class.php htdocs/expedition/card.php	2019-10-07 12:33:13 +02:00
VESSILLER	219b0d8925	FIX Import of product using units	2019-10-07 12:26:02 +02:00
Laurent Destailleur	b85c4f0864	Merge branch 'develop' into new-import-product-country-code	2019-10-07 10:41:35 +02:00
Laurent Destailleur	c3ae87816f	Merge pull request #12049 from frederic34/holidayz ... lang file for holidays is holiday	2019-10-07 10:21:36 +02:00
Frédéric FRANCE	ec8569dd85	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-06 15:56:21 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
Frédéric FRANCE	8a9f08d5a3	lang file for holidays is holiday	2019-10-06 11:29:24 +02:00
Frédéric FRANCE	6384e7eb67	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-05 20:02:16 +02:00
Laurent Destailleur	b883a8092a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php htdocs/core/lib/product.lib.php htdocs/core/tpl/extrafields_list_search_input.tpl.php htdocs/fourn/facture/card.php htdocs/product/class/html.formproduct.class.php	2019-10-05 19:35:40 +02:00
VESSILLER	0e23fbc6df	NEW add country code in import product model	2019-10-04 10:04:02 +02:00
Frédéric FRANCE	98023353fe	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-03 17:21:31 +02:00
Sebastien Baguet	9daffcbe07	Fix for no subscription members	2019-10-03 00:29:41 +02:00
Alexandre SPANGARO	848acb6096	Update index	2019-10-02 08:49:33 +02:00
Alexandre SPANGARO	a6e429ff32	Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal	2019-10-02 08:49:00 +02:00
Frédéric FRANCE	aca9d92db8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-01 22:03:33 +02:00
Frédéric FRANCE	c57c8eee88	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-01 07:41:10 +02:00
Alexandre SPANGARO	16c6c9ae75	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Alexandre SPANGARO	8dea427f58	Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal	2019-09-30 21:23:27 +02:00
Laurent Destailleur	0846a081cb	Merge branch 'develop' into new_branch_29_06_2019	2019-09-30 21:06:51 +02:00
Frédéric FRANCE	b87610adcc	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-30 19:34:35 +02:00
Laurent Destailleur	33908afb66	Update zapier logo	2019-09-30 19:30:31 +02:00
Frédéric FRANCE	258424416e	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-30 07:49:52 +02:00
Alexandre SPANGARO	8e42ac8cd0	Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal	2019-09-28 22:31:08 +02:00
Frédéric FRANCE	cea3669ffa	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-28 00:35:14 +02:00
Laurent Destailleur	981c5c877a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-27 20:02:08 +02:00
Laurent Destailleur	24ad67e0e1	Fix missing $conf	2019-09-27 20:01:57 +02:00
Laurent Destailleur	d0d884742f	FIX #11861 Not consistent code to manage measuring units	2019-09-27 19:45:33 +02:00
Laurent Destailleur	c0e7c558a1	Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception ... NEW widget box for supplier orders awaiting reception	2019-09-27 15:32:43 +02:00
Laurent Destailleur	8e08636d36	Merge pull request #11922 from laudeco/feature/11880_add_custom_element_in_project_export ... [#11880] - support the referents also in the beluga export of a project	2019-09-27 14:22:49 +02:00
Laurent Destailleur	138b494b98	Merge pull request #11936 from aspangaro/11.0_translation ... Translate and some fix	2019-09-27 12:15:50 +02:00
Laurent Destailleur	881c90ab74	Merge pull request #11953 from grandoc/new_branch_24_09_2019 ... add missing translation	2019-09-27 11:56:01 +02:00
Laurent Destailleur	2b6b1a3e1c	Fix syntax error	2019-09-27 11:12:21 +02:00
Frédéric FRANCE	03086026b8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-27 08:06:13 +02:00
Frédéric FRANCE	5eb0fb462b	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-27 07:59:02 +02:00
Laurent Destailleur	7d91649520	NEW Add extrafields in export of expense report (and holiday)	2019-09-25 15:48:44 +02:00
Frédéric FRANCE	41cb628d05	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-25 08:06:44 +02:00
Laurent Destailleur	961f2b5165	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/viewcat.php htdocs/fourn/class/fournisseur.product.class.php htdocs/takepos/invoice.php	2019-09-24 14:25:02 +02:00
Philippe GRAND	7ec43e8b59	add missing translation	2019-09-24 09:54:57 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Alexandre SPANGARO	a005408d83	NEW Accountancy - Add an option to hide FAQ on index and add widget in area	2019-09-23 20:42:50 +02:00
Alexandre SPANGARO	1e49fd0d45	Translate	2019-09-20 15:07:58 +02:00
Alexandre SPANGARO	e32772fdc5	Translate	2019-09-20 09:44:49 +02:00
Alexandre SPANGARO	278312f38f	Translate	2019-09-20 07:02:14 +02:00
Laurent De Coninck	49b75e3f52	support referent in the beluga export. ... The beluga export of a project, now supports additional referents, coming from the hooks. When the element is present in the view of all elements of the project, the beluga export will also export this element. [see: X]	2019-09-17 17:40:42 +02:00
Laurent Destailleur	24cb1390e4	FIX Update of leave request when CSRF with token is on ... FIX Export of leave request show the number of open days	2019-09-17 13:17:25 +02:00
Frédéric FRANCE	850b9fd52a	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-17 08:24:31 +02:00
Laurent Destailleur	eda17e9c54	Merge pull request #11850 from OPEN-DSI/new-stock-import-warehouse-parent ... NEW add parent id or ref column in warehouse import	2019-09-15 15:44:33 +02:00
Frédéric FRANCE	c9c7d60fc0	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-14 16:37:10 +02:00
Frédéric FRANCE	de3a67f5bd	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-12 21:52:06 +02:00
Laurent Destailleur	5fd88f438f	Clean code	2019-09-12 00:03:51 +02:00
Frédéric FRANCE	3fddef0c9e	add socialnetworks dictionary	2019-09-11 22:27:09 +02:00
ATM john	9db2e27289	add widget box for supplier orders awaiting reception	2019-09-10 21:47:08 +02:00
stickler-ci	017a0fb70f	Fixing style errors.	2019-09-10 19:42:31 +00:00
Philippe GRAND	6634ef4de5	Merge remote-tracking branch 'origin/develop' into new_branch_29_06_2019	2019-09-10 21:40:04 +02:00
Laurent Destailleur	61cf47aa16	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-10 00:14:07 +02:00
VESSILLER	3ea2e0c915	NEW add parent id or ref column in warehouse import	2019-09-09 15:03:20 +02:00
Laurent Destailleur	66a9fabd06	If you develop your own emailing target selector and used ... parent::add_to_target(...), you must now use parent::addToTargets(...)	2019-09-09 14:18:25 +02:00
Laurent Destailleur	d2131a0be8	Add filter on usage on project list	2019-09-09 14:08:10 +02:00
Laurent Destailleur	28ba5abb89	Clean code	2019-09-09 13:31:14 +02:00
Laurent Destailleur	2c0d7ba97d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-09 12:58:42 +02:00
Laurent Destailleur	21d84f63a5	Work on template	2019-09-09 12:58:32 +02:00
Laurent Destailleur	64506a3e00	Merge pull request #11843 from aspangaro/11.0_translation ... Translation	2019-09-09 12:57:55 +02:00
Laurent Destailleur	1d311b2969	Fix scrutinizer	2019-09-08 21:21:33 +02:00
Alexandre SPANGARO	985cfab8e9	Traduction	2019-09-08 05:22:13 +02:00
Alexandre SPANGARO	3ddd123eb1	Traduction	2019-09-08 05:18:52 +02:00
Alexandre SPANGARO	d9fa32b555	Traduction	2019-09-08 05:00:24 +02:00
Alexandre SPANGARO	3a2b3d311a	Traduction	2019-09-08 04:57:09 +02:00
Frédéric FRANCE	4054ebaf27	wip	2019-09-07 15:12:07 +02:00
Frédéric FRANCE	c6a02312a9	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-07 14:19:07 +02:00
Laurent Destailleur	f338a5f9ad	Debug module datapolicy	2019-09-06 19:56:00 +02:00
Laurent Destailleur	89e1cdff61	Debug module datapolicy	2019-09-06 19:41:15 +02:00
Laurent Destailleur	09d6826e62	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/supplier_order.php htdocs/langs/en_US/admin.lang	2019-09-06 14:27:01 +02:00
Laurent Destailleur	f08c07f315	Fix bugs reported by scrutinizer	2019-09-06 10:42:51 +02:00
Laurent Destailleur	5b1d94a668	Fix translation	2019-09-06 02:27:49 +02:00
Laurent Destailleur	08c16ea2e1	Fix bad dir created	2019-09-06 02:03:26 +02:00
Laurent Destailleur	12868413bd	Doxygen	2019-09-05 13:33:49 +02:00
Laurent Destailleur	1950952b05	Missing label	2019-09-04 15:11:06 +02:00
Laurent Destailleur	7d5877b8b1	Doxygen	2019-09-04 13:50:10 +02:00
Laurent Destailleur	bb7b34816d	Merge pull request #11785 from a-schild/develop ... Fix for issue #11783	2019-09-03 17:43:49 +02:00
Laurent Destailleur	bd47bd096b	NEW Can defined a position of numbering submodules for thirdparties	2019-09-03 15:58:20 +02:00
Laurent Destailleur	106938168f	Fix phpcs	2019-09-03 15:36:49 +02:00
Laurent Destailleur	a9bb891760	Merge pull request #11767 from aspangaro/11.0_digitaria ... NEW Digitaria model for numbering accountancy thirdparty	2019-09-03 15:01:10 +02:00
Laurent Destailleur	c4a4efe0dc	Merge pull request #11769 from Tim-Otte/develop ... NEW: Added odt support to supplier orders	2019-09-03 13:04:33 +02:00
Tim Otte	0f02a621ba	Seriously? One newline failed the stickler ci test?	2019-09-03 10:39:11 +02:00
Tim Otte	443f16bddf	Removed debug output	2019-09-03 10:36:00 +02:00
Laurent Destailleur	210effc742	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-30 04:18:23 +02:00
a-schild	ad779bc714	Correctly initialize $addDescription in all cases	2019-08-29 09:46:10 +02:00
a-schild	c38e29185c	Fix for #11783	2019-08-29 09:43:49 +02:00
Laurent Destailleur	bb893fd3a8	FIX Missing the filter fields in export of expense report and leaves	2019-08-27 18:16:34 +02:00
Tim Otte	5abfc04900	Merge branch 'develop' into develop	2019-08-27 16:37:41 +02:00
Alexandre SPANGARO	47b9af09a5	Fix stickler	2019-08-27 16:37:14 +02:00
Tim Otte	75152cb210	Added odt support to supplier orders	2019-08-27 16:22:16 +02:00
Alexandre SPANGARO	958361b45e	Merge branch 'develop' into 11.0_digitaria	2019-08-27 14:11:27 +02:00
Alexandre SPANGARO	d7f8df2e45	NEW Digitaria model for numbering accountancy thirdparty	2019-08-27 14:03:33 +02:00
Laurent Destailleur	999db7ed41	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/salaries/card.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/takepos/invoice.php	2019-08-26 16:49:25 +02:00
Laurent Destailleur	2b8c57b714	Merge pull request #11724 from ptibogxiv/patch-228 ... Fix stripelive_oauthcallback.php	2019-08-26 16:34:40 +02:00
ptibogxiv	30b929c621	Update modAdherent.class.php	2019-08-23 13:57:22 +02:00
ptibogxiv	839ba76ae4	Update stripetest_oauthcallback.php	2019-08-23 08:58:08 +02:00
ptibogxiv	06fdd5ddbc	Update stripelive_oauthcallback.php	2019-08-22 22:50:41 +02:00
ptibogxiv	0be59646a8	Update stripelive_oauthcallback.php	2019-08-22 22:00:53 +02:00
Laurent Destailleur	ae7ba9ff54	Doc	2019-08-17 15:15:52 +02:00
Laurent Destailleur	8874a0f3c1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-15 23:39:11 +02:00
Laurent Destailleur	386f929fe3	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/lib/website.lib.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php	2019-08-15 23:39:02 +02:00
Laurent Destailleur	6430c74793	Merge pull request #11168 from hregis/develop_menu ... NEW add new function "setEntity()" and better compatibility with Multicompany	2019-08-15 21:00:05 +02:00
Laurent Destailleur	4534826583	Merge pull request #11633 from fmarcet/10.0 ... FIX: Make protected all pfd models functions	2019-08-15 19:04:32 +02:00
Laurent Destailleur	bb35d9be0c	Fix copy of templates during activation of module	2019-08-15 01:50:01 +02:00
Regis Houssin	7c8b3c9a38	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-08-13 07:34:02 +02:00
Ferran Marcet	f1c0442a77	FIX: Add comment before protected functions	2019-08-12 10:16:04 +02:00
Laurent Destailleur	8647a20c18	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/langs/en_US/admin.lang htdocs/product/dynamic_price/class/price_parser.class.php htdocs/product/stats/facture.php	2019-08-10 01:57:43 +02:00
Laurent Destailleur	2824dee11a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/langs/en_US/admin.lang htdocs/product/dynamic_price/class/price_parser.class.php	2019-08-10 01:20:17 +02:00
VESSILLER	ae144a6910	NEW compute column value from others columns in import module	2019-08-08 17:31:16 +02:00
Frédéric FRANCE	7f23b77cbe	Update pdf_proforma.modules.php	2019-08-05 15:00:06 +02:00
Frédéric FRANCE	fde526f59d	Update pdf_einstein.modules.php	2019-08-05 14:58:50 +02:00
Ferran Marcet	fd1204bcd2	FIX: Make protected all pfd models functions	2019-08-05 13:41:25 +02:00
Laurent Destailleur	ded8a71b9a	Merge pull request #11614 from grandoc/patch_01_08_2019 ... add some translation	2019-08-01 16:39:05 +02:00
Laurent Destailleur	3d8f6dca76	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-01 16:30:32 +02:00
Laurent Destailleur	5a719769bc	Fix phpcs	2019-08-01 16:29:18 +02:00
Laurent Destailleur	6512435f9f	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/core/modules/cheque/doc/pdf_blochet.class.php htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php	2019-08-01 16:27:55 +02:00
Philippe GRAND	18a56c7ef2	add some translation	2019-08-01 15:59:37 +02:00
Philippe GRAND	b32dbbfb74	Merge remote-tracking branch 'upstream/develop' into develop	2019-08-01 15:43:30 +02:00
Laurent Destailleur	90ddc0a214	FIX #10930	2019-08-01 14:27:57 +02:00
Regis Houssin	d9ea61e47c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop_menu Conflicts: htdocs/commande/class/commande.class.php	2019-07-31 12:49:56 +02:00
Laurent Destailleur	6b789a13a1	Merge pull request #11562 from atm-quentin/FIX_pdf_cheque ... FIX name was able to be in field but went back to new line	2019-07-30 22:00:58 +02:00
Laurent Destailleur	a7390e7e47	Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop ... NEW Management of retained warranty on situation invoices	2019-07-30 21:53:09 +02:00
Laurent Destailleur	34f78c555d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-30 20:55:35 +02:00
Laurent Destailleur	192fb45ce7	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/accountancy/bookkeeping/card.php htdocs/accountancy/bookkeeping/list.php htdocs/adherents/card.php htdocs/compta/sociales/list.php htdocs/compta/sociales/payments.php htdocs/core/modules/import/import_csv.modules.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/holiday/class/holiday.class.php htdocs/viewimage.php	2019-07-30 20:55:15 +02:00
Laurent Destailleur	5f2439bf0a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-07-30 20:37:44 +02:00
Marc de Lima Lucio	703506c0e2	FIX: import filter error	2019-07-30 14:11:21 +02:00
Marc de Lima Lucio	449ef92007	FIX: categories import: prevent mismatch between category type and object type	2019-07-30 12:31:03 +02:00
Laurent Destailleur	11e3aa5860	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-29 11:07:11 +02:00
Laurent Destailleur	f825711206	Code comment	2019-07-29 11:01:29 +02:00
Laurent Destailleur	9f7d118f6f	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-27 02:40:56 +02:00
atm-quentin	1f7cd1a3f8	FIX name was able to be in field but went back to new line	2019-07-26 11:05:16 +02:00
Philippe GRAND	0baea71d0f	Merge remote-tracking branch 'upstream/develop' into develop	2019-07-26 07:54:14 +02:00
Laurent Destailleur	0b69bf9957	FIX #11553	2019-07-25 18:17:17 +02:00
Laurent Destailleur	a46bfc7a29	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/project.lib.php	2019-07-25 17:54:14 +02:00
Laurent Destailleur	4a8377e4fd	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-07-25 17:52:40 +02:00
Florian Mortgat	65e9d8f239	FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined)	2019-07-25 11:14:59 +02:00
Laurent Destailleur	bef3423764	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/admin.lang	2019-07-22 19:12:27 +02:00
Laurent Destailleur	9f95b10d0e	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/comm/action/list.php htdocs/comm/action/peruser.php htdocs/compta/prelevement/card.php htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php	2019-07-22 19:11:27 +02:00
Laurent Destailleur	5dcf4d6646	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-07-22 19:06:48 +02:00
Laurent Destailleur	b4e0c5ef6c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-07-22 18:51:32 +02:00
Alexandre SPANGARO	8b8aaafc05	Merge branch 'develop' into 10.0_intracommreport	2019-07-20 05:47:31 +02:00
Alexandre SPANGARO	0af1206892	Merge branch 'develop' into 11.0_salaries	2019-07-19 23:11:06 +02:00
Alexandre SPANGARO	9ab0734415	NEW Extrafields on salaries	2019-07-19 23:08:24 +02:00
Laurent Destailleur	f745d01bf3	Prepare change of properties "titre" into "title"	2019-07-19 13:22:54 +02:00
Florian Mortgat	b100cdb9db	FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set.	2019-07-19 11:58:21 +02:00
Regis Houssin	cbda42d146	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-07-19 09:37:34 +02:00
Alexandre SPANGARO	21bd46fc15	Merge remote-tracking branch 'upstream/develop' into 11.0_salaries	2019-07-17 14:09:46 +02:00
Alexandre SPANGARO	79d8351dda	NEW Extrafields on salaries	2019-07-17 14:09:25 +02:00
Laurent Destailleur	d694360c66	Fix warning	2019-07-15 23:46:54 +02:00
Laurent Destailleur	adfbd62f8b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-14 00:44:35 +02:00
Laurent Destailleur	e1d4917704	FIX Missing field "Conciliated" into bank transaction export	2019-07-14 00:39:42 +02:00
Laurent Destailleur	4387d40b9a	Translation lignes -> lines	2019-07-05 21:55:08 +02:00
Laurent Destailleur	f5cc29417d	Translation lignes -> lines	2019-07-05 21:50:35 +02:00
Laurent Destailleur	2fee41f712	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-04 12:27:00 +02:00
Laurent Destailleur	d9560dbb61	Fix var not initialized	2019-07-02 18:02:06 +02:00
John Botella	9c2e83dcae	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-07-01 09:51:26 +02:00
Philippe GRAND	6d625d7d1e	Merge remote-tracking branch 'upstream/develop' into develop	2019-06-30 12:04:55 +02:00
Laurent Destailleur	3461a61cbf	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-29 18:35:54 +02:00
Laurent Destailleur	e9c6a10bdd	Fix phpcs	2019-06-29 18:35:36 +02:00
Laurent Destailleur	b177787f0a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php htdocs/product/class/product.class.php	2019-06-29 18:28:51 +02:00
Laurent Destailleur	72084f4684	Fix protected	2019-06-29 16:49:32 +02:00
Laurent Destailleur	adb3062a9f	Work on nblignes -> nblines	2019-06-29 16:38:14 +02:00
Laurent Destailleur	b37f55d13a	Add log	2019-06-29 16:06:40 +02:00
Philippe GRAND	bebd219e5a	translations	2019-06-29 10:30:26 +02:00
Philippe GRAND	bd43e90c2b	translations	2019-06-29 10:28:29 +02:00
Philippe GRAND	59424f228e	translations	2019-06-29 10:21:26 +02:00
Philippe GRAND	05e9885ba7	translations	2019-06-29 10:18:45 +02:00
Philippe GRAND	ecc4d4227b	translations	2019-06-29 10:14:46 +02:00
Philippe GRAND	837c1aca35	translation	2019-06-29 09:48:52 +02:00
Laurent Destailleur	cd024da628	Merge branch 'develop' into new_branch_27_06_2019	2019-06-28 13:39:27 +02:00
Philippe GRAND	2c237b8420	translations	2019-06-27 09:51:48 +02:00
Philippe GRAND	5a4ba837cc	translations	2019-06-27 09:47:00 +02:00
Philippe GRAND	6e8d86fb4a	translations	2019-06-27 09:43:50 +02:00
Philippe GRAND	f1e40b4b22	translations	2019-06-27 09:31:42 +02:00
Philippe GRAND	5a8cc4934b	translations	2019-06-27 09:29:00 +02:00
Philippe GRAND	c20f9a4842	translations	2019-06-27 09:22:44 +02:00
Alexandre SPANGARO	9da91c06ed	Merge branch 'develop' into 10.0_intracommreport	2019-06-26 15:11:43 +02:00
John Botella	ee98f3e6d7	fix travis recommendations	2019-06-26 10:48:22 +02:00
John Botella	7e14a598e2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-26 09:43:43 +02:00
John Botella	4c4444a53f	fix travis recommendations	2019-06-26 09:36:53 +02:00
Laurent Destailleur	51a1550dbb	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog	2019-06-25 23:14:49 +02:00
Laurent Destailleur	7a0962a393	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/core/modules/modAccounting.class.php	2019-06-25 23:13:55 +02:00
Laurent Destailleur	d5479cd9ae	Fix import of ledger	2019-06-25 22:37:13 +02:00
Laurent Destailleur	20471c54e1	Fix import code (regex of data imported + import of constant) ... Conflicts: htdocs/core/modules/import/import_csv.modules.php htdocs/core/modules/import/import_xlsx.modules.php	2019-06-25 22:27:00 +02:00
Laurent Destailleur	fc574946b1	Fix import of ledger	2019-06-25 22:23:51 +02:00
Laurent Destailleur	0ae0951d7d	Fix import code (regex of data imported + import of constant)	2019-06-25 22:23:30 +02:00
Laurent Destailleur	a7bd734ece	Rename ->produit into ->product. Still permissions to rename.	2019-06-24 21:18:49 +02:00
Laurent Destailleur	229dd4d3f5	Merge branch 'develop' into 10.0_accounting6	2019-06-24 19:59:11 +02:00
Laurent Destailleur	f66281d7e5	Update modAccounting.class.php	2019-06-24 19:50:22 +02:00
Laurent Destailleur	cade08342c	Merge pull request #11390 from grandoc/develop ... translation	2019-06-24 15:30:30 +02:00
John Botella	ec7446762c	Fix travis	2019-06-24 14:36:06 +02:00
Laurent Destailleur	01b8522216	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-24 13:56:39 +02:00
John Botella	9c414a7a57	Change function to camel case	2019-06-24 12:22:33 +02:00
John Botella	a83e7f3665	Add retained warranty to PDF	2019-06-24 12:00:55 +02:00
John Botella	7b6925b8f7	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-24 10:29:43 +02:00
Alexandre SPANGARO	4a84dcaa62	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2019-06-23 21:47:34 +02:00
Laurent Destailleur	43fc0466e5	Fix position of modules	2019-06-23 20:05:15 +02:00
Philippe GRAND	e877f108ac	translation	2019-06-22 12:18:56 +02:00
Philippe GRAND	9d698c257c	translation	2019-06-22 12:10:32 +02:00
Philippe GRAND	8de36dc7c1	translation	2019-06-22 12:10:09 +02:00
Philippe GRAND	2d3b0b8f9e	translation	2019-06-22 12:09:50 +02:00
Philippe GRAND	26af2d8fe3	translation	2019-06-22 12:09:28 +02:00
Philippe GRAND	5379d4085f	translation	2019-06-22 12:08:57 +02:00
Philippe GRAND	a8d50228db	translation	2019-06-22 12:08:36 +02:00
Philippe GRAND	4d4b5abb7e	translation	2019-06-22 12:08:08 +02:00
Philippe GRAND	d75f4eb1c8	translation	2019-06-22 12:07:46 +02:00
Philippe GRAND	3cc97ec351	translation	2019-06-22 12:07:02 +02:00
Philippe GRAND	592591ff69	translation	2019-06-22 12:06:37 +02:00
Philippe GRAND	053b129f52	translation	2019-06-22 12:06:01 +02:00
Philippe GRAND	a9222c602f	translation	2019-06-22 12:04:26 +02:00
Laurent Destailleur	403d41ec30	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-22 11:55:33 +02:00
Laurent Destailleur	4499447a89	Fix sort order of import profiles ... Fix picto in import profile for accounting	2019-06-21 14:27:38 +02:00
Laurent Destailleur	bbbd066ac9	Merge pull request #11119 from openthink-laurent/add-customer-code-customer-orders-documents ... Add customer code in customer orders documents	2019-06-21 13:33:57 +02:00
Laurent Destailleur	7ffcd3603b	Add option DOC_SHOW_CUSTOMER_CODE ... Because we have a lot of information and the REF is better to retrieve/search an order and know the customer code, i added a hidden option to show this field.	2019-06-21 13:33:24 +02:00
Laurent Destailleur	f9095408b6	Fix sort order of export profiles ... Add missing pos information into export of invoice Add missing label of project in export of invoice	2019-06-21 13:25:40 +02:00
Laurent Destailleur	ad4bd05efb	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/core/modules/modAdherent.class.php	2019-06-21 11:29:06 +02:00
Laurent Destailleur	c725db166d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-06-21 11:26:44 +02:00
Laurent Destailleur	70c950bd7c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/modules/modAdherent.class.php	2019-06-21 11:26:25 +02:00
Laurent Destailleur	9093be2f0a	FIX Add missing end date of subscription in export	2019-06-21 11:23:49 +02:00
Alexandre SPANGARO	20b516885f	WIP	2019-06-20 09:33:01 +02:00
Laurent Destailleur	898d766489	Merge pull request #11354 from rycks/allowZeroAsAccountNumber ... Allow zero as account number	2019-06-20 03:09:37 +02:00
Laurent Destailleur	daab58974e	Merge pull request #11366 from aspangaro/10.0_other2 ... Missing language key	2019-06-20 03:02:13 +02:00
Alexandre SPANGARO	abfb708044	Merge branch 'develop' into 10.0_intracommreport	2019-06-19 21:43:40 +02:00
Laurent Destailleur	f9cc120d75	Debug module ticket	2019-06-19 12:53:28 +02:00
Alexandre SPANGARO	13836d3e21	Missing language ley	2019-06-19 06:21:53 +02:00
Eric Seigne	80d4d8754d	allow zero as accountancy code nomber (replace all empty tests by != '')	2019-06-17 18:28:11 +02:00
Regis Houssin	6597c9f60d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-17 06:45:08 +02:00
Laurent Destailleur	e8b139d1c6	Fix repeated logs and fetch	2019-06-13 22:48:31 +02:00
Laurent Destailleur	ab9742f4df	Try to keep proportion of logo	2019-06-13 10:09:20 +02:00
Laurent Destailleur	2bc821d900	Try to keep proportions of logo	2019-06-13 10:08:35 +02:00
Francis Appels	3f63be6045	fix typo	2019-06-12 22:10:40 +02:00
Francis Appels	a26c868783	Fix scrutinizer bugs	2019-06-12 22:05:10 +02:00
Laurent Destailleur	91a4e8bc0a	Merge	2019-06-12 12:09:56 +02:00
Laurent Destailleur	6d5637c389	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/admin/multicurrency.php htdocs/core/actions_massactions.inc.php	2019-06-12 12:03:46 +02:00
Laurent Destailleur	2d52537106	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-06-12 10:07:08 +02:00
Laurent Destailleur	8447259f25	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-06-12 10:06:34 +02:00
Laurent Destailleur	420f3bbdab	FIX #11316	2019-06-12 10:05:53 +02:00
Laurent Destailleur	0edd94c4f8	Merge pull request #11303 from atm-florian/10.0 ... fix various little stuff from scrutinizer (undeclared vriable, misspelling variable, mistype declaration)	2019-06-07 15:21:30 +02:00
Laurent Destailleur	3d8910d327	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0	2019-06-06 19:19:05 +02:00
Laurent Destailleur	3ff154c1d0	Fix sql error	2019-06-06 19:05:47 +02:00
florian HENRY	f2171d466b	fix variable name	2019-06-05 17:05:26 +02:00
Laurent Destailleur	21a1e0d7b3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/categories/index.php htdocs/comm/action/list.php htdocs/comm/action/rapport/index.php htdocs/compta/paiement.php htdocs/compta/sociales/document.php htdocs/compta/tva/document.php htdocs/core/actions_massactions.inc.php htdocs/core/class/commonobject.class.php htdocs/fourn/facture/paiement.php htdocs/loan/document.php htdocs/main.inc.php	2019-06-04 19:03:27 +02:00
John BOTELLA	d7a393bbd3	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-04 14:00:18 +02:00
Regis Houssin	7b8b1a9052	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-03 11:04:28 +02:00
Laurent Destailleur	57cfb4b007	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/website/class/website.class.php	2019-06-02 12:36:07 +02:00
Laurent Destailleur	300f46cb01	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-06-02 12:30:25 +02:00
Maxime Kohlhaas	15fd24a511	Fix : remove hardcoded llx_ prefix	2019-05-31 12:14:51 +02:00
Laurent Destailleur	fd0eb47b35	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/holiday/card.php	2019-05-29 09:57:48 +02:00
Laurent Destailleur	6e9cd819c1	Fix phpcs	2019-05-29 09:55:09 +02:00
Laurent Destailleur	19ff0120ff	# WARNING: head commit changed in the meantime ... Removed uselesss files (replaced by DebugBar)	2019-05-26 11:42:00 +02:00
Laurent Destailleur	f2e03b3909	Removed useless files (replaced with DebugBar)	2019-05-26 11:24:57 +02:00
Laurent Destailleur	b67363d769	Fix rename export php lib to avoi duplicate with old library.	2019-05-25 18:54:43 +02:00
Laurent Destailleur	c04d082ad1	FIX Import of chart of account	2019-05-24 18:14:15 +02:00
Laurent Destailleur	49991eabf8	Fix import of accounting account from ref in import profiles	2019-05-24 17:09:18 +02:00
Laurent Destailleur	63824861a6	Fix import of chart of account. The account parent was not managed.	2019-05-24 16:58:06 +02:00
Laurent Destailleur	ccfb4f575b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formfile.class.php	2019-05-24 15:00:14 +02:00
Laurent Destailleur	89455672a2	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php	2019-05-24 14:58:21 +02:00
Marc de Lima Lucio	49385fcab3	FIX: situation invoices: bad detailed VAT in situations following the first one	2019-05-23 14:37:40 +02:00
Alexandre SPANGARO	65070afce4	WIP	2019-05-22 17:22:49 +02:00
Alexandre SPANGARO	a182b89bb0	Merge branch 'develop' into 10.0_closure2	2019-05-22 13:52:13 +02:00
Regis Houssin	4f2f23f522	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-22 08:45:31 +02:00
Laurent Destailleur	657bd5c2fe	Move module from develop to experimental	2019-05-21 15:50:16 +02:00
Laurent Destailleur	eafc35b00f	Look and feel v10	2019-05-21 13:27:45 +02:00
Alexandre SPANGARO	11015dd072	WIP	2019-05-21 09:55:41 +02:00
Regis Houssin	2cf630c213	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-20 16:10:47 +02:00
Laurent Destailleur	ec922d3d17	Add CONTRACT_HIDE_PLANNED_DATE_ON_PDF and CONTRACT_HIDE_REAL_DATE_ON_PDF	2019-05-20 14:54:09 +02:00
Alexandre SPANGARO	a239e0e81f	WIP Admin	2019-05-20 13:33:54 +02:00
Frédéric FRANCE	aef850f6d3	zapier for dolibarr	2019-05-19 21:12:22 +02:00
Alexandre SPANGARO	f9e3a958c4	NEW Module Intracomm report	2019-05-19 10:44:09 +02:00
ATM John BOTELLA	f714b45efb	FIX scrutinizer feedback	2019-05-18 15:53:07 +02:00
Laurent Destailleur	26d4875f8f	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop	2019-05-18 02:27:23 +02:00
Laurent Destailleur	6c4a4c34c4	Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0	2019-05-18 02:26:40 +02:00
Maxime Kohlhaas	095fd2769a	Fix project beluga order status	2019-05-18 01:11:34 +02:00
Laurent Destailleur	c50a3c4a78	Merge pull request #11190 from atm-florian/develop ... add info into change log	2019-05-18 00:47:24 +02:00
florian HENRY	0c3500fc5d	fix : #10562	2019-05-18 00:45:41 +02:00
Nicolas ZABOURI	1f789fa266	FIX syntax	2019-05-17 11:24:24 +02:00
Laurent Destailleur	53b7f3fe92	Merge pull request #11173 from aspangaro/10.0_accountancy_cat ... NEW Add accoutancy sell intra and export in product import	2019-05-16 21:14:46 +02:00
Laurent Destailleur	c24c81692d	Update modAccounting.class.php	2019-05-16 21:13:57 +02:00
Alexandre SPANGARO	6f9010c362	NEW add category in export of chart of accounts	2019-05-13 22:02:43 +02:00
Alexandre SPANGARO	d99424cdf0	NEW Add accoutancy sell intra and export in product import	2019-05-13 21:19:18 +02:00
Laurent Destailleur	30e08d8f9c	Merge pull request #11167 from andreubisquerra/master ... TakePOS as stable	2019-05-13 11:43:17 +02:00
Laurent Destailleur	f0cdaff936	Fix status of crons	2019-05-13 10:26:30 +02:00
Regis Houssin	156b25a702	FIX use "multidir_output" instead "dir_output"	2019-05-12 16:36:29 +02:00
Regis Houssin	3cb6ca34e9	FIX multicompany compatibility	2019-05-12 16:06:16 +02:00
Regis Houssin	b73df2698d	FIX better compatibility with Multicompany	2019-05-12 14:25:41 +02:00
andreubisquerra	166ac1b8c2	TakePOS as stable as indicated in the Changelog	2019-05-11 21:33:26 +02:00
Laurent Destailleur	0bd4c61009	Fix default setup of module workflow was not set	2019-05-10 18:15:09 +02:00
Laurent Destailleur	aaeb7dc9d6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/holiday.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/filefunc.inc.php htdocs/product/list.php	2019-05-10 17:45:33 +02:00
Juanjo Menent	e36df726a1	Merge remote-tracking branch 'upstream/9.0' into 9.0	2019-05-09 20:42:04 +02:00
Juanjo Menent	2b182c1cc1	FIX: #11097	2019-05-09 20:39:30 +02:00
Laurent Destailleur	bc49f47718	Fix phpcs	2019-05-09 19:48:13 +02:00
Laurent Destailleur	52153d6aa2	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-05-09 12:38:27 +02:00
Laurent Destailleur	677b333d0a	FIX: Add hidden option MAIN_PDF_HIDE_SITUATION to hide situation (quick ... hack to fix output pb).	2019-05-09 12:38:00 +02:00
Laurent Destailleur	6e69db8a1a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/product/doc/pdf_standard.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php htdocs/filefunc.inc.php	2019-05-09 12:27:14 +02:00
Laurent Destailleur	f1fd4108ae	Debug/Clean code	2019-05-09 12:17:20 +02:00
Laurent Destailleur	d3bbb93ada	Fix template for situation ... Conflicts: htdocs/core/modules/facture/doc/pdf_crabe.modules.php	2019-05-09 12:16:43 +02:00
Laurent Destailleur	ed98817f0d	Fix template for situation	2019-05-09 10:15:38 +02:00
Laurent Destailleur	c3693cb007	Fix phpcs	2019-05-08 19:10:12 +02:00
Laurent Destailleur	590b1d1e90	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php	2019-05-08 18:24:50 +02:00
Laurent Destailleur	f2e24ed96e	Fix bad contact used	2019-05-08 18:20:28 +02:00
Laurent Destailleur	dc1ee29fef	Fix default permission of new users	2019-05-07 23:03:45 +02:00
Alexandre SPANGARO	4baffae297	Merge remote-tracking branch 'upstream/develop' into 10.0_closure2	2019-05-05 22:43:02 +02:00
Alexandre SPANGARO	4e16992796	WIP	2019-05-05 14:07:42 +02:00
Laurent Léonard	8d659d8078	Fix date format in customer orders documents	2019-05-04 07:12:13 +02:00
Laurent Léonard	a7a8eb3648	Add customer code in customer orders documents	2019-05-04 06:33:23 +02:00
Laurent Destailleur	9115df7439	Debug v10	2019-05-03 11:25:53 +02:00
Laurent Destailleur	8c76c404bd	Merge pull request #11088 from defrance/patch-141 ... planned_timespent not present on task	2019-05-02 14:01:19 +02:00
Laurent Destailleur	425dd6faf7	Merge branch 'develop' into patch-2	2019-05-02 12:38:38 +02:00
Laurent Destailleur	ceeb9752ce	Fix PHPCS	2019-05-02 12:28:40 +02:00
Frédéric FRANCE	ac304f58b0	clean new commits	2019-04-30 20:37:59 +02:00
Laurent Destailleur	0cd1fc79f2	NEW Add a security permission to edit php dynamic content on website.	2019-04-30 13:05:13 +02:00
BENKE Charlene	f8f40a9239	planned_timespent not present on task ... duration is the good one	2019-04-30 11:27:33 +02:00
Laurent Destailleur	3007905508	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formmail.class.php htdocs/core/modules/modProduct.class.php htdocs/core/modules/modService.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/stripe/class/stripe.class.php	2019-04-30 03:30:40 +02:00
Laurent Destailleur	d55c440740	Fix some product and services export profiles	2019-04-29 21:23:01 +02:00
Laurent Destailleur	101f6a5af3	FIX Several fixes on import of services/products	2019-04-29 20:41:36 +02:00
Laurent Destailleur	5d40124b22	Fix import of product price with multilevel prices	2019-04-29 20:15:03 +02:00
Laurent Destailleur	091132de2f	Signatures of methods createFromClone() has been standardized. All ... methods requires the object User as first parameter.	2019-04-25 12:11:32 +02:00
Laurent Destailleur	ab1f371ea5	Fix encoding on expense report PDF	2019-04-24 20:58:27 +02:00
Laurent Destailleur	0090b26946	Merge pull request #11049 from frederic34/patch-5 ... Update mod_expedition_ribera.php	2019-04-24 10:10:11 +02:00
Laurent Destailleur	ad9dfc826a	Merge pull request #11051 from frederic34/patch-7 ... Update mod_commande_saphir.php	2019-04-24 10:09:58 +02:00
Laurent Destailleur	7ad214b2f1	Merge pull request #11052 from frederic34/patch-8 ... Update mod_chequereceipt_thyme.php	2019-04-24 10:09:38 +02:00
Laurent Destailleur	49c7d07e8c	Merge pull request #11050 from frederic34/patch-6 ... Update mod_contract_magre.php	2019-04-24 10:09:28 +02:00
Laurent Destailleur	a1bff2ca36	Merge pull request #11048 from frederic34/patch-2 ... Update mod_bom_advanced.php	2019-04-24 10:09:07 +02:00
Laurent Destailleur	6d397316d6	Merge pull request #11053 from frederic34/patch-9 ... In export modules, id is string	2019-04-24 10:08:30 +02:00
Laurent Destailleur	742de5c777	Fix pdf of expense report	2019-04-23 16:04:53 +02:00
Frédéric FRANCE	53c851de7b	Update export_csv.modules.php	2019-04-20 11:42:25 +02:00
Frédéric FRANCE	a0ce52bb23	Update export_excel.modules.php	2019-04-20 11:41:37 +02:00
Frédéric FRANCE	73b32f0679	Update export_excel2007.modules.php	2019-04-20 11:41:19 +02:00
Frédéric FRANCE	06a8513575	Update export_excel2007new.modules.php	2019-04-20 11:40:59 +02:00
Frédéric FRANCE	b05a5e49ff	Update export_tsv.modules.php	2019-04-20 11:39:38 +02:00
Frédéric FRANCE	e5559ac2f9	Update mod_chequereceipt_thyme.php ... The property db does not exist on mod_chequereceipt_thyme.	2019-04-20 09:36:47 +02:00
Frédéric FRANCE	fbf718f330	Update mod_commande_saphir.php	2019-04-20 09:34:23 +02:00
Frédéric FRANCE	bed3ed705c	Update mod_contract_magre.php ... The property db does not exist on mod_contract_magre.	2019-04-20 09:31:53 +02:00
Frédéric FRANCE	9b9d4ddc45	Update mod_expedition_ribera.php ... The property db does not exist on mod_bom_advanced.	2019-04-20 09:29:24 +02:00
Frédéric FRANCE	e9b13baac2	Update mod_bom_advanced.php ... The property db does not exist on mod_bom_advanced.	2019-04-20 09:27:15 +02:00
Laurent Destailleur	734b1ca7c1	Fix phpcs	2019-04-19 22:18:08 +02:00
Laurent Destailleur	6ed616a969	Merge pull request #11042 from aspangaro/10.0_assets ... Assets - Debug - Look & field v10	2019-04-19 13:02:50 +02:00
Laurent Destailleur	99f5bf2a6c	Merge pull request #11027 from AXeL-dev/patch-8 ... Fix debugbar module class	2019-04-19 13:00:37 +02:00
Frédéric FRANCE	315349a681	replace @public by @var	2019-04-18 18:41:02 +02:00
Alexandre SPANGARO	3729e32368	Assets - Debug - Look & field v10	2019-04-18 14:13:48 +02:00
Alexandre SPANGARO	660a1cea1d	NEW Accounting - Add rights on export, delete operations in ledger	2019-04-17 07:26:39 +02:00
AXeL-dev	bef38c9abe	debugbar module class: remove unreached part of code (may generate errors on call)	2019-04-17 00:33:49 +01:00
Laurent Destailleur	b5bf6830e9	Introduce method convertBackOfficeMediasLinksToPublicLinks so links to ... media added from filemanager in notes are visible by PDFs builder.	2019-04-17 01:13:59 +02:00
Laurent Destailleur	3d5a1a5550	Merge pull request #10988 from OPEN-DSI/new-societe-export-fields ... New company fields in contact export	2019-04-11 16:29:01 +02:00
Laurent Destailleur	2b2838058c	Merge pull request #10986 from grandoc/new_branch_09_04_2019 ... New branch 09 04 2019	2019-04-11 16:28:18 +02:00
Laurent Destailleur	2eeb4b8734	Debug ticket module	2019-04-10 15:45:55 +02:00
Laurent Destailleur	26594fab98	Debug module ticket	2019-04-10 15:11:38 +02:00
Lionel VESSILLER	86d4f5d213	New company fields in contact export	2019-04-09 10:13:26 +02:00
Philippe GRAND	bb5e60ad54	update code	2019-04-09 09:39:38 +02:00
Philippe GRAND	9b8297ee15	update code	2019-04-09 09:39:00 +02:00
Philippe GRAND	2e7256a094	update code	2019-04-09 09:38:35 +02:00
Philippe GRAND	1b2aa27c2f	update code	2019-04-09 09:37:21 +02:00
Philippe GRAND	3ff5c6b42b	update code	2019-04-09 09:36:51 +02:00
Philippe GRAND	144ebb2f89	update code	2019-04-09 09:35:39 +02:00
Philippe GRAND	1d84dcbe17	update code	2019-04-09 09:34:26 +02:00
Philippe GRAND	c26afe15ff	update code	2019-04-09 09:33:20 +02:00
Philippe GRAND	350a04108f	update code	2019-04-09 09:32:18 +02:00
Philippe GRAND	edd5661f1a	update code	2019-04-09 09:31:33 +02:00
Philippe GRAND	3a209d2454	update code	2019-04-09 09:30:32 +02:00
Philippe GRAND	42df91e4e2	update code	2019-04-09 09:29:01 +02:00
Philippe GRAND	30e2d8fa6b	update code	2019-04-09 09:28:01 +02:00
Philippe GRAND	327ac2973e	update code	2019-04-09 09:27:25 +02:00
Philippe GRAND	2ed71b0039	update code	2019-04-09 09:26:39 +02:00
Philippe GRAND	baecb20562	update code	2019-04-09 09:24:41 +02:00
Philippe GRAND	0de76fc128	update code	2019-04-09 09:23:50 +02:00
Philippe GRAND	f833bbcb32	update code	2019-04-09 09:21:34 +02:00
Philippe GRAND	68c1332244	update code	2019-04-09 09:19:16 +02:00
Laurent Destailleur	a19cedfc13	Fix phpcs	2019-04-09 00:48:12 +02:00
Laurent Destailleur	c0b3ee23e5	Fix phpcs	2019-04-08 23:50:18 +02:00
Laurent Destailleur	d01b54ca5b	Fix phpcs	2019-04-08 18:02:27 +02:00
Laurent Destailleur	1274d71a10	Fix phpcs	2019-04-08 16:00:01 +02:00
Laurent Destailleur	2b87c8b663	Merge pull request #10810 from mwelters/patch-1 ... NEW improve Expensereport, Inverse Receiver	2019-04-08 14:04:08 +02:00
Laurent Destailleur	a7ced8ab5d	Merge pull request #10963 from aspangaro/v10_p3 ... NEW: Accounting - Invert module name	2019-04-08 13:39:51 +02:00
Laurent Destailleur	2606de2119	Update modAccounting.class.php	2019-04-08 13:35:06 +02:00
Laurent Destailleur	976ef92df6	Merge pull request #10958 from atm-john/new_look_and_feel_pdf ... New pdf document column system : supplier order and expedition	2019-04-08 13:31:47 +02:00
Laurent Destailleur	54714bc755	Deprecated property ->fk_departement is now ->state_id everywhere.	2019-04-05 20:06:13 +02:00
Laurent Destailleur	67760d6f41	Fix phpcs	2019-04-05 19:53:45 +02:00
Laurent Destailleur	997d6cca0a	Fix $db not defined	2019-04-05 19:49:47 +02:00
Alexandre SPANGARO	4335ea9064	NEW: Accounting - Invert module name	2019-04-04 17:13:20 +02:00
John BOTELLA	3299b765f1	New pdf models	2019-04-04 10:16:20 +02:00
John BOTELLA	a668cc28b1	Add table title auto height	2019-04-03 16:19:49 +02:00
Laurent Destailleur	76bf412f95	Fix phpcs	2019-04-03 14:40:15 +02:00
Laurent Destailleur	bfed3685a5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-04-03 13:27:13 +02:00
Laurent Destailleur	7120078b0f	NEW Simplification of styles architcture: Showing or not the menuhider ... is completely decided by CSS and screen size instead of PHP+CSS.	2019-04-03 13:26:50 +02:00
Laurent Destailleur	64889f4639	Merge pull request #10947 from grandoc/new_branch_01_04_2019 ... update comments	2019-04-03 11:05:05 +02:00
Philippe Grand	ebe50a4efe	Update pdf_sponge.modules.php	2019-04-02 15:33:10 +02:00
Philippe Grand	b978014fb9	Update pdf_eratosthene.modules.php	2019-04-02 15:32:01 +02:00
markus	c08b69d00b	Rely on MAIN_INVERT_SENDER_RECIPIENT	2019-04-01 19:59:58 +02:00
Laurent Destailleur	8fe1be1a67	Removed deprecated use of string in dol_print_date(). Only date allowed.	2019-04-01 19:27:34 +02:00
Philippe GRAND	b154ae752a	update comments	2019-04-01 09:43:07 +02:00
Philippe GRAND	e8e5e5cfb9	update comments	2019-04-01 09:42:01 +02:00
Philippe GRAND	e2c5c49c52	update comments	2019-04-01 09:40:50 +02:00
Philippe GRAND	2b41e9166d	update comments	2019-04-01 09:39:22 +02:00
Philippe GRAND	eb901e7c4e	update comments	2019-04-01 09:38:23 +02:00
Philippe GRAND	46488f6a0c	update comments	2019-04-01 09:36:52 +02:00
Philippe GRAND	2c41610ac8	update comments	2019-04-01 09:21:08 +02:00
Philippe GRAND	ae681eaf06	update comments	2019-04-01 09:18:56 +02:00
Philippe GRAND	f828e6ee90	update comments	2019-04-01 09:15:48 +02:00
Laurent Destailleur	ce62e7f7ec	Merge pull request #10939 from OPEN-DSI/new-exports-fields ... New add fields in contact export	2019-03-31 19:00:16 +02:00
Lionel VESSILLER	a52935f6e4	New add fields in contact export ... - thirdparty fields (address, phone, email, typent) - contact field (status)	2019-03-28 18:29:36 +01:00
Alexandre SPANGARO	9f9dd2cd30	NEW: Add import of accounting account for intra/export selling on product card	2019-03-28 11:41:59 +01:00
markus	f942917f53	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1	2019-03-24 17:42:49 +01:00
Laurent Destailleur	df9e121ac6	Enhance the module debugbar. Do not scan the log anymore.	2019-03-23 14:37:54 +01:00
markus	b0e12deb25	Fix travis	2019-03-20 09:36:23 +01:00
markus	8c010c2580	fix travis	2019-03-18 10:24:21 +01:00
Laurent Destailleur	bb8845ac41	Merge pull request #10865 from atm-maxime/new_box_birthdays ... NEW Widget birthdays of the month	2019-03-18 08:56:58 +01:00
markus	b4807e7972	remove unneeded class	2019-03-17 18:38:26 +01:00
Maxime Kohlhaas	e090cd6f87	New box birthdays of the month	2019-03-17 16:55:26 +01:00
Laurent Destailleur	1abfd1f58e	Add page to setup module debugbar ... Fix CSS	2019-03-17 00:32:39 +01:00
Laurent Destailleur	95c1275efc	Fix phpcs	2019-03-16 20:10:22 +01:00
Laurent Destailleur	c2badb57d7	NEW: Add module debugbar	2019-03-16 16:27:14 +01:00
markus	a45fbfae76	fix travis	2019-03-16 14:37:07 +01:00
Philippe GRAND	3d65b887a7	update with html5 compliant code	2019-03-14 14:34:33 +01:00
Philippe GRAND	719ecde6e9	update with html5 compliant code	2019-03-14 14:34:04 +01:00
Philippe GRAND	756bdfc6a8	update with html5 compliant code	2019-03-14 14:33:36 +01:00
Philippe GRAND	9ee27936f7	update with html5 compliant code	2019-03-14 14:33:00 +01:00
Philippe GRAND	ad9f75d3e9	update with html5 compliant code	2019-03-14 14:32:26 +01:00
Philippe GRAND	80858b39d9	update with html5 compliant code	2019-03-14 14:31:40 +01:00
Philippe GRAND	f71769e0e6	update with html5 compliant code	2019-03-14 14:31:08 +01:00
Philippe GRAND	f13d520830	update with html5 compliant code	2019-03-14 14:30:41 +01:00
Philippe GRAND	b4a9b3aa20	update with html5 compliant code	2019-03-14 14:30:08 +01:00
Philippe GRAND	5977cdad26	update with html5 compliant code	2019-03-14 14:29:16 +01:00
Philippe GRAND	6c4070eb87	update with html5 compliant code	2019-03-14 14:28:36 +01:00
Philippe GRAND	310670b3f6	update with html5 compliant code	2019-03-14 14:27:54 +01:00
Philippe GRAND	f082bd3e96	update with html5 compliant code	2019-03-14 14:27:16 +01:00
Philippe GRAND	af4edbba2b	update with html5 compliant code	2019-03-14 14:26:43 +01:00
Philippe GRAND	d21dbe915b	update with html5 compliant code	2019-03-14 14:26:08 +01:00
Philippe GRAND	6b878a2c64	update with html5 compliant code	2019-03-14 14:25:21 +01:00
Rafael Ingenleuf	f19574f27f	changed UserBankAccount fetch	2019-03-12 11:57:50 +01:00
markus	e1f9e845cc	remove empty line	2019-03-11 16:44:15 +01:00
markus	bdb03bd454	add class	2019-03-11 16:41:01 +01:00
markus	d7ca08afb0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1	2019-03-10 15:26:35 +01:00
markus	47fce826fe	changes	2019-03-10 14:15:06 +01:00
markus	1737229eab	update hints	2019-03-10 13:59:32 +01:00
markus	47f15897aa	remove double line	2019-03-10 13:49:01 +01:00
markus	6a8d76ea39	honor MAIN_INVERT_SENDER_RECIPIENT	2019-03-10 13:44:50 +01:00
markus	6f05d6ea36	changes	2019-03-10 13:41:18 +01:00
markus	dcaed95bfe	changes	2019-03-10 13:31:51 +01:00
markus	6ef6248d58	use fk_user_author	2019-03-10 13:27:22 +01:00
markus	b4c8977a44	next step	2019-03-10 13:22:21 +01:00
markus	b302f569a9	make public	2019-03-10 13:14:17 +01:00
markus	5b0ed63f6d	use global $user	2019-03-10 13:11:43 +01:00
Frédéric FRANCE	b69f63e7d7	replace html by html5	2019-03-10 09:32:19 +01:00
markus	1ac54853d9	improve	2019-03-09 18:34:57 +01:00
markus	a789cfe576	fix typo	2019-03-09 18:32:44 +01:00
markus	b8ec0b20b0	#3700 New Switch EXPENSEREPORT_INVERT_SENDER_RECIPIENT	2019-03-09 18:22:37 +01:00
Laurent Destailleur	b710e28ffa	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/admin/adherent.php htdocs/admin/barcode.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/langs/en_US/admin.lang	2019-03-09 01:20:13 +01:00
Laurent Destailleur	e38427a41f	Fix var not initialized	2019-03-08 19:56:21 +01:00
markus	e452a2e31d	add bank lib	2019-03-08 18:14:22 +01:00
markus	41c21b88c1	More output	2019-03-08 16:46:08 +01:00
markus	1bf99b81f1	Display more	2019-03-08 16:44:35 +01:00
Markus Welters	fac99ccd98	Merge pull request #2 from countiy/patch-1 ... expensereport changed IBAN	2019-03-08 16:37:04 +01:00
markus	c595dca5e7	fix typo	2019-03-08 16:35:11 +01:00
Rafael Ingenleuf	a505323fe7	expensereport changed IBAN	2019-03-08 16:27:08 +01:00
Rafael Ingenleuf	bcd3921561	expensereport layout changed and IBAN added	2019-03-08 15:36:09 +01:00
Laurent Destailleur	1a96a7a88f	FIX More complete auto setup of barcode module ... Add tooltip help on member setup module	2019-03-08 11:31:12 +01:00
Christophe Battarel	d414e3eb48	add product extrafields	2019-03-07 15:00:48 +01:00
Laurent Destailleur	daaa4ca0c2	Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed ... PSR2.Classes.PropertyDeclaration.VarUsed	2019-03-07 12:49:13 +01:00
Christophe Battarel	a6bb1cf5f6	avoid timeout	2019-03-07 11:27:06 +01:00
Frédéric FRANCE	2745f98644	PSR2.Classes.PropertyDeclaration.VarUsed	2019-03-05 22:10:46 +01:00
Laurent Destailleur	cfd39a1483	Merge pull request #10742 from OPEN-DSI/fix-pdf-beluga-orientation ... Fix authorize long references in Beluga PDF model (uses Landscape mode)	2019-03-05 18:45:02 +01:00
Laurent Destailleur	16e90ffae4	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/DolibarrModules.class.php htdocs/langs/en_US/website.lang	2019-03-05 15:59:42 +01:00
Laurent Destailleur	d18a5853df	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/modules/DolibarrModules.class.php	2019-03-05 15:57:31 +01:00
Laurent Destailleur	98f5bb2ed3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-05 15:55:08 +01:00
Laurent Destailleur	b851911708	Dolibarize module ticket	2019-03-05 12:18:46 +01:00
Lionel VESSILLER	ef10a32069	Fix authorize long references in Beluga PDF model (uses Landscape mode)	2019-03-05 11:18:44 +01:00
Laurent Destailleur	4a582485b9	Debug module ticket	2019-03-04 19:19:09 +01:00
Laurent Destailleur	0d49f27831	Code style	2019-03-04 17:36:45 +01:00
Laurent Destailleur	68bb95079a	Ignore 2 rules	2019-03-04 17:36:03 +01:00
Laurent Destailleur	69794f5293	Fix phpcs	2019-03-04 17:31:50 +01:00
Laurent Destailleur	d8259f94e1	Work on BOM module	2019-03-04 13:40:16 +01:00
Laurent Destailleur	925def5390	Work on BOM module	2019-03-04 13:37:00 +01:00
Laurent Destailleur	7b7ff33fdf	Work on BOM module	2019-03-04 13:30:43 +01:00
Laurent Destailleur	1c775b7b68	Work of BOM module	2019-03-04 12:46:07 +01:00
Laurent Destailleur	481d0de010	FIX Import of service was not available in update mode	2019-03-03 13:02:20 +01:00
Frédéric FRANCE	3037e4a157	Update DolibarrModules.class.php	2019-03-02 20:49:53 +01:00
Laurent Destailleur	8fce6e5e31	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/card.php htdocs/core/modules/mailings/xinputfile.modules.php htdocs/fourn/facture/card.php	2019-03-02 19:13:37 +01:00
Laurent Destailleur	40e923ec85	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/modules/modAgenda.class.php	2019-03-02 19:07:14 +01:00
Laurent Destailleur	8f8aaf1e8c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-02 19:05:51 +01:00
Laurent Destailleur	4f9981063f	Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing	2019-03-02 18:26:50 +01:00
Laurent Destailleur	5f6ca1119a	Replace arrow picto with fontawesome	2019-03-02 14:07:13 +01:00
Frédéric FRANCE	014f69850e	add visibility	2019-03-01 23:08:57 +01:00
Frédéric FRANCE	c5c27fdb77	add visibility	2019-03-01 19:24:06 +01:00
Frédéric FRANCE	bd2e541fd6	add visibility	2019-03-01 18:28:51 +01:00
Frédéric FRANCE	796ea6f4ea	add visibility	2019-02-28 23:19:58 +01:00
Frédéric FRANCE	0022c4fe72	add visibility	2019-02-28 22:44:12 +01:00
Frédéric FRANCE	7e31ca48d8	add visibility	2019-02-28 22:07:48 +01:00
Frédéric FRANCE	4f9e35f350	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-28 20:48:23 +01:00
Frédéric FRANCE	92c5c15033	add visibility	2019-02-28 20:48:07 +01:00
Marc de Lima Lucio	b96ac794e9	FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work	2019-02-28 16:15:32 +01:00
Laurent Destailleur	cefaeb583f	Update xinputfile.modules.php	2019-02-28 11:24:43 +01:00
Laurent Destailleur	85d46a5270	Update xinputfile.modules.php	2019-02-28 11:24:07 +01:00
Laurent Destailleur	b8b55fb748	WIP Add IFTTT module	2019-02-28 10:30:27 +01:00
gauthier	1237a6d3e9	FIX : same thing here	2019-02-27 14:58:10 +01:00
gauthier	49e03b009f	FIX : if empty error message, we just see "error" displayed	2019-02-27 14:50:01 +01:00
Frédéric FRANCE	5a4ac82880	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 08:23:29 +01:00
Laurent Destailleur	58e2901d14	Fix phpcs	2019-02-27 00:54:07 +01:00
Frédéric FRANCE	8b4e920d5e	add visibility	2019-02-26 22:42:19 +01:00
Frédéric FRANCE	5016bc7188	wip	2019-02-26 21:48:21 +01:00
Frédéric FRANCE	81f2f99db5	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-26 21:16:01 +01:00
Frédéric FRANCE	e6c3eb0ba1	wip	2019-02-26 21:13:07 +01:00
Laurent Destailleur	9e82c37963	WIP Start module BOM	2019-02-26 19:27:04 +01:00
Laurent Destailleur	3a2a1b4a56	Debug module ticket	2019-02-26 13:43:09 +01:00
Frédéric FRANCE	675a17a74c	wip	2019-02-26 00:34:43 +01:00
Frédéric FRANCE	346d1f410c	wip	2019-02-25 23:15:48 +01:00
Frédéric FRANCE	915841eeb9	wip	2019-02-25 22:50:19 +01:00
Frédéric FRANCE	c89e4d79b8	wip	2019-02-25 22:27:04 +01:00
Frédéric FRANCE	1c07006015	wip	2019-02-25 21:36:27 +01:00
Cristian Torres	c781eeb17d	[FIX] ORDER BY before custom filters for where ... When filtering data "and cac.libelle" would be appended after ORDER BY	2019-02-24 20:55:27 +01:00
Laurent Destailleur	dfd6a0feaa	Merge pull request #10643 from tony13tv/patch-3 ... [FIX] ORDER BY before custom filters for where	2019-02-24 20:55:01 +01:00
Laurent Destailleur	89087473e1	Merge pull request #10674 from frederic34/patch-4 ... Update printgcp.modules.php	2019-02-24 20:44:08 +01:00
Frédéric FRANCE	e7706192b5	doc comment	2019-02-24 10:08:42 +01:00
Frédéric FRANCE	b51432790f	Update printgcp.modules.php	2019-02-24 09:39:48 +01:00
Frédéric FRANCE	485431a722	Update printgcp.modules.php	2019-02-24 09:31:19 +01:00
Laurent Destailleur	4da1bef6dc	Merge pull request #10654 from ptibogxiv/patch-125 ... FIX Stripe live Oauth	2019-02-23 14:21:25 +01:00
ptibogxiv	dd160a6242	Create stripelive_oauthcallback.php	2019-02-22 14:56:39 +01:00
Philippe GRAND	5a88930062	fix : The property total_vat does not exist on Reception	2019-02-21 14:38:12 +01:00
Cristian Torres	31aa3ec376	[FIX] ORDER BY before custom filters for where ... When filtering data "and cac.libelle" would be appended after ORDER BY	2019-02-20 11:45:07 -06:00
Regis Houssin	1c3541295b	FIX wrong class name "CUnits instead CMeasuringUnits"	2019-02-19 09:24:30 +01:00
Laurent Destailleur	ebfb6beee3	Merge	2019-02-18 19:14:42 +01:00
Laurent Destailleur	e6e18ff616	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/menus/edit.php htdocs/product/stock/card.php htdocs/product/stock/info.php htdocs/product/stock/movement_list.php	2019-02-14 15:33:17 +01:00
Laurent Destailleur	89050da856	Merge	2019-02-14 15:27:31 +01:00
Laurent Destailleur	afc612c2cb	Merge pull request #10592 from frederic34/patch-30 ... Update mod_expensereport_sand.php	2019-02-14 13:32:00 +01:00
Laurent Destailleur	418bab3214	Merge pull request #10591 from frederic34/patch-29 ... Update mod_payment_ant.php	2019-02-14 13:31:51 +01:00
Laurent Destailleur	a655481adb	Merge pull request #10590 from frederic34/patch-28 ... Update mod_ticket_universal.php	2019-02-14 13:31:33 +01:00
Laurent Destailleur	cd9bd26267	Merge pull request #10589 from frederic34/patch-27 ... Update mod_facture_mercure.php	2019-02-14 13:31:15 +01:00
Laurent Destailleur	b69a416960	Merge pull request #10588 from frederic34/patch-24 ... Update mod_commande_fournisseur_orchidee.php	2019-02-14 13:29:15 +01:00
Laurent Destailleur	7e4a4c2ae6	Merge pull request #10587 from frederic34/patch-23 ... Update mod_holiday_immaculate.php	2019-02-14 13:28:56 +01:00
Laurent Destailleur	c45ed24342	Merge pull request #10586 from frederic34/patch-22 ... Update modules_holiday.php	2019-02-14 13:28:30 +01:00
Laurent Destailleur	3050366372	Fix table of units already exists. Merge duplicate c_measuring_units ... with c_units.	2019-02-14 13:02:44 +01:00
Regis Houssin	359318392f	FIX missing entity filter in function "build_filterField()" (export)	2019-02-14 10:47:07 +01:00
Frédéric FRANCE	6276845956	Update mod_expensereport_sand.php	2019-02-13 23:48:44 +01:00
Frédéric FRANCE	1e52ef19a5	Update mod_payment_ant.php	2019-02-13 23:45:28 +01:00
Frédéric FRANCE	423a69ffad	Update mod_ticket_universal.php	2019-02-13 23:44:06 +01:00
Frédéric FRANCE	210fb2eac1	Update mod_facture_mercure.php	2019-02-13 23:41:47 +01:00
Frédéric FRANCE	5c50ea8afe	Update mod_commande_fournisseur_orchidee.php ... The property db does not exist on mod_commande_fournisseur_orchidee	2019-02-13 23:39:02 +01:00
Frédéric FRANCE	9370c8b3f6	Update mod_holiday_immaculate.php	2019-02-13 23:36:16 +01:00
Frédéric FRANCE	e0843e6130	Update modules_holiday.php	2019-02-13 23:35:44 +01:00
Laurent Destailleur	a689f8dc3f	Code comment	2019-02-13 23:34:28 +01:00
florian HENRY	d88475c61a	Merge branch 'develop' of local repository into dev_importproduct_measuringunit	2019-02-13 08:59:18 +01:00
Laurent Destailleur	0d8447ad39	Merge branch 'develop' of https://github.com/wdammak/dolibarr into ... wdammak-develop # Conflicts: # htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php	2019-02-12 16:58:55 +01:00
florian HENRY	5b5f96bafb	NEW : measuring unit dictionnary and product size/unit import	2019-02-12 16:58:11 +01:00
Laurent Destailleur	205152501e	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml htdocs/public/payment/newpayment.php	2019-02-12 13:39:39 +01:00
Laurent Destailleur	e054b080a5	Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-12 13:33:39 +01:00
Laurent Destailleur	b1088f556f	Merge pull request #10536 from grandoc/new_branch_09_02_2019 ... language internationalization	2019-02-12 13:28:56 +01:00
Laurent Destailleur	a62bccaf24	Fix phpcs	2019-02-11 19:19:05 +01:00
Laurent Destailleur	f0e56abac7	NEW Module ticket is available as a stable module	2019-02-11 19:16:37 +01:00
Laurent Destailleur	c095f802dd	Dolibarrize module ticket	2019-02-11 14:51:59 +01:00
Frédéric FRANCE	152d8ffcbf	Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-10 11:08:59 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Frédéric FRANCE	580e5c42d2	GenericFunctionsFunctionCallArgumentSpacing	2019-02-09 12:00:49 +01:00
Philippe Grand	92ec149fb6	Update modules_fichinter.php	2019-02-09 11:05:52 +01:00
Philippe GRAND	869f59de96	language internationalization	2019-02-09 10:56:59 +01:00
Laurent Destailleur	7625eb7cd4	Fix missing error management after afterPDFCreation hook. ... Removed dead code	2019-02-08 19:54:24 +01:00
Laurent Destailleur	a916708068	Fix missing disable dependency	2019-02-08 19:01:47 +01:00
Laurent Destailleur	ed733fb82d	Fix phpcs	2019-02-08 13:28:10 +01:00
Laurent Destailleur	8760b1e592	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-08 12:57:50 +01:00
Laurent Destailleur	27da574e38	Fix phpcs	2019-02-08 12:36:33 +01:00
Laurent Destailleur	1611c613f5	Fix phpcs	2019-02-08 12:19:51 +01:00
Laurent Destailleur	ec686a8f79	Fix phpcs	2019-02-08 11:30:20 +01:00
Laurent Destailleur	38d4284638	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/db/pgsql.class.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/filefunc.inc.php htdocs/imports/import.php htdocs/supplier_proposal/card.php	2019-02-08 11:26:08 +01:00
Laurent Destailleur	fe1188c4ea	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/filefunc.inc.php	2019-02-08 10:44:45 +01:00
Laurent Destailleur	af92303319	Merge pull request #10487 from frederic34/psr2squizwhite ... psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-08 09:30:25 +01:00
Laurent Destailleur	6a4a92510d	Code comment	2019-02-07 13:32:05 +01:00
atm-ph	8e6a567b09	Fix display payment table on multiple pages	2019-02-07 12:36:22 +01:00
Frédéric FRANCE	e1e14ae6e6	wip	2019-02-03 22:58:56 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	57f81217ee	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/index.php	2019-02-03 21:14:44 +01:00
Laurent Destailleur	4d41b1b33c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 19:45:45 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Laurent Destailleur	9f7dfe2921	Merge pull request #10481 from frederic34/psr2forloop ... psr2 Squiz.ControlStructures.ForEachLoopDeclaration	2019-02-03 19:11:07 +01:00
Laurent Destailleur	f8b10e9c3d	Doxygen	2019-02-03 18:47:55 +01:00
Frédéric FRANCE	273d68381c	psr2 end file new line none found	2019-02-03 15:21:21 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Frédéric FRANCE	03701fa091	psr2	2019-02-02 18:25:01 +01:00
Laurent Destailleur	75845a990f	FIX Missing province in export of invoice	2019-02-01 22:55:28 +01:00
Frédéric FRANCE	f5b2cf75f2	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
Laurent Destailleur	6de732d7f8	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/facture/mod_facture_mars.php htdocs/core/modules/facture/mod_facture_terre.php	2019-02-01 16:07:18 +01:00
Laurent Destailleur	35f65a571c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/modules/facture/mod_facture_mars.php htdocs/core/modules/facture/mod_facture_terre.php htdocs/fourn/commande/list.php	2019-02-01 16:05:43 +01:00
Laurent Destailleur	dee2a373c1	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2019-02-01 16:01:18 +01:00
Laurent Destailleur	eb3621839a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/members.lang htdocs/langs/fr_FR/members.lang	2019-02-01 15:14:19 +01:00
Laurent Destailleur	4254ad0d33	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-31 15:51:54 +01:00
Laurent Destailleur	14dea53700	FIX Missing field in import/export of users	2019-01-31 15:51:02 +01:00
gauthier	09ba059c21	FIX : need an order by in case we found other invoice with same number but not same date	2019-01-31 11:03:06 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
Laurent Destailleur	97248a830b	FIX #10440	2019-01-30 16:28:37 +01:00
Laurent Destailleur	6d992a6d7b	FIX #10440	2019-01-30 16:24:27 +01:00
Laurent Destailleur	e72d6c50e6	Merge pull request #10428 from frederic34/toomanylines ... PSR2.Files.EndFileNewline.TooMany	2019-01-30 16:17:09 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Laurent Destailleur	c354656b1b	Merge pull request #10449 from ptibogxiv/patch-108 ... NEW : list of stripe's payout	2019-01-30 15:02:27 +01:00
Laurent Destailleur	60fa8d08c2	Merge pull request #10456 from aspangaro/10.0_Ledger_improve_import ... FIX: FEC Compatibility for import in ledger	2019-01-30 15:01:02 +01:00
Alexandre SPANGARO	84ecfd96fb	Update example	2019-01-30 11:22:01 +01:00