3258 Commits

Author	SHA1	Message	Date
Laurent Destailleur	d93de4b931	FIX Import of customer prices per segment was not possible	2020-01-02 20:08:43 +01:00
Frédéric FRANCE	90235d0528	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-31 13:57:40 +01:00
Alexandre SPANGARO	c664a1e42d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2019-12-31 08:34:37 +01:00
Alexandre SPANGARO	1f282ad0e4	Merge branch 'develop' into 12.0_a1	2019-12-31 06:48:04 +01:00
Laurent Destailleur	8838dc38db	Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks	2019-12-30 22:25:06 +01:00
Laurent Destailleur	ece8390277	Add tables to store translation of all objects (like llx_product_lang)	2019-12-26 13:23:18 +01:00
Laurent Destailleur	4333cf2040	Show the stripe accoutn of a cu_ and a card_	2019-12-24 12:53:10 +01:00
Florian Mortgat	cbca0f389a	Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks	2019-12-24 10:00:20 +01:00
Florian Mortgat	7359c4140d	FIX 12.0 - bookmark URLs get truncated to 255 chars - PR rescheduled for merging into the next major version (v12.0)	2019-12-24 09:54:02 +01:00
Alexandre SPANGARO	6b55b600f1	Merge remote-tracking branch 'upstream/develop' into 12.0_a1	2019-12-23 21:31:52 +01:00
Laurent Destailleur	07c1a5717e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/facture_situation.php htdocs/core/class/html.formother.class.php	2019-12-23 14:16:34 +01:00
Laurent Destailleur	9a08a6bf6d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/categories/traduction.php htdocs/compta/facture/class/facture.class.php htdocs/contact/card.php htdocs/core/modules/modSociete.class.php htdocs/fourn/class/fournisseur.product.class.php htdocs/langs/en_US/products.lang htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php htdocs/margin/productMargins.php htdocs/margin/tabs/productMargins.php htdocs/margin/tabs/thirdpartyMargins.php	2019-12-23 14:13:26 +01:00
Laurent Destailleur	eb32e98127	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-12-23 14:01:44 +01:00
Laurent Destailleur	36e6036e9e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-12-23 14:01:00 +01:00
Laurent Destailleur	a076c3c20c	Add mig file for v12	2019-12-23 13:48:38 +01:00
Laurent Destailleur	22f3b69666	Fix default value for situation invoice	2019-12-22 11:59:38 +01:00
Laurent Destailleur	c0ef3b46ad	Work on MRP module	2019-12-20 15:31:05 +01:00
Laurent Destailleur	d1fdd11b37	Close #10907	2019-12-19 11:32:10 +01:00
Laurent Destailleur	4a734e53a6	Fix column too low. ... Fix automatic event not found if from a module with several objects	2019-12-17 14:47:58 +01:00
Francis Appels	95b56f0518	Update 6.0.0-7.0.0.sql ... timestamp NOT NULL can cause SQL error.	2019-12-17 12:19:35 +01:00
Laurent Destailleur	0ef3de98c6	Try to fix conflict of several stripe accounts	2019-12-15 17:18:09 +01:00
Laurent Destailleur	5d955fa7e0	Update 10.0.0-11.0.0.sql	2019-12-14 13:51:13 +01:00
Frédéric FRANCE	57055bad03	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-13 14:36:00 +01:00
Florian Mortgat	b715ecd7d9	FIX bookmark URLs get truncated to 255 chars	2019-12-11 16:42:03 +01:00
Laurent Destailleur	2b5866aca2	WIP Complete module MRP	2019-12-08 23:45:06 +01:00
Laurent Destailleur	3030a9fa2a	Fix manifest file was saved but not enabled.	2019-12-07 13:09:55 +01:00
Frédéric FRANCE	4c5c6b6ff1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-03 17:56:43 +01:00
Maxime Kohlhaas	83928b4708	Fix duration must be double(24,8) to store seconds	2019-12-01 18:19:22 +01:00
Frédéric FRANCE	b2912e688b	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-27 22:54:05 +01:00
Laurent Destailleur	b440f2b1f4	Fix a ref is not null	2019-11-26 08:53:54 +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	6191307865	Debug v11	2019-11-22 12:22:27 +01:00
Laurent Destailleur	11be3b53f3	Fix migration	2019-11-21 18:39:51 +01:00
Laurent Destailleur	e8bc8b68c1	Fix missing field in migration	2019-11-21 18:17:40 +01:00
Laurent Destailleur	f7319aeefb	Fix size of field	2019-11-20 18:50:03 +01:00
Frédéric FRANCE	d182eee4bf	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-19 23:26:00 +01:00
Laurent Destailleur	5d7a1f1265	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/card.php htdocs/core/class/extrafields.class.php htdocs/langs/en_US/stocks.lang	2019-11-19 19:02:14 +01:00
Laurent Destailleur	74c85b742e	Fix ref must be null until the generation of ref is ok	2019-11-18 18:09:12 +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
Laurent Destailleur	502626156e	Work on MRP module	2019-11-17 01:23:19 +01:00
Frédéric FRANCE	5c0976a778	doxygen accountancy class	2019-11-16 09:58:14 +01:00
Frédéric FRANCE	a3e092b227	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-14 09:21:26 +01:00
Alexandre SPANGARO	1a9c430e00	Add migration	2019-11-14 04:53:13 +01:00
Frédéric FRANCE	05ab4f79ef	categories for actioncomm	2019-11-13 18:44:11 +01:00
Frédéric FRANCE	4f90fe0fd2	Update 10.0.0-11.0.0.sql	2019-11-12 21:34:45 +01:00
Laurent Destailleur	2c718af26c	Missing container type 'menu' ... Fix: Add security if container is not a page	2019-11-12 13:55:46 +01:00
Laurent Destailleur	3054177e79	Fix type of tickets	2019-11-10 12:28:30 +01:00
Laurent Destailleur	eb378b45a4	Work on BOM - MO module	2019-11-09 20:35:45 +01:00
Laurent Destailleur	59d83fce59	Debug MRP module	2019-11-09 19:57:38 +01:00