64259 Commits

Author	SHA1	Message	Date
wdammak	63ffb7a873	Fix backtopage url	2019-02-15 06:04:58 +01:00
wdammak	03c5e040c5	Fix backtopage url	2019-02-15 05:48:56 +01:00
wdammak	fd4f82b1b7	Fix conflict	2019-02-15 05:32:01 +01:00
wdammak	4dc4a25bb5	Add Default Warehouse to user card	2019-02-15 05:24:25 +01:00
wdammak	d31aadf5da	Add Default Warehouse to user	2019-02-15 05:20:33 +01:00
Laurent Destailleur	b44acd177b	Fix right style	2019-02-15 02:01:17 +01:00
Laurent Destailleur	44c1d30f6f	FIX adding css by page if url is externam	2019-02-15 00:46:11 +01:00
Laurent Destailleur	62760bf1e2	Fix regression	2019-02-14 21:45:23 +01:00
Laurent Destailleur	a7af1b1765	Remove deprecated code	2019-02-14 16:29:13 +01:00
Laurent Destailleur	aedf91b522	Fix: add parameter $includecount	2019-02-14 16:22:42 +01:00
Laurent Destailleur	6c3e2446f9	Merge pull request #10604 from ptibogxiv/patch-115 ... FIX: count of ref in an contact object API	2019-02-14 16:19:02 +01:00
Laurent Destailleur	04942d3016	Merge branch 'develop' into patch-110	2019-02-14 16:11:56 +01:00
Laurent Destailleur	567d92f886	Update llx_prelevement_facture_demande.sql	2019-02-14 16:10:31 +01:00
Laurent Destailleur	00cfee0c37	Update 9.0.0-10.0.0.sql	2019-02-14 16:10:06 +01:00
ptibogxiv	0aeaac7c5f	Fix count of ref in an contact object API	2019-02-14 16:00:45 +01:00
Laurent Destailleur	8f493bfbdc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-14 15:33:27 +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	2c2052d113	Update card.php ... Avoid regression on restrictArea	2019-02-14 15:23:34 +01:00
Laurent Destailleur	4ac086ab70	Update info.php	2019-02-14 15:23:07 +01:00
Laurent Destailleur	173d28cf5a	Update mouvement.php ... Avoid regression on restrictArea	2019-02-14 15:22:22 +01:00
Laurent Destailleur	d2ee00d4bb	Update security.lib.php ... Avoid regression on test of restrictArea	2019-02-14 15:21:01 +01:00
Laurent Destailleur	a18496d1d2	Merge pull request #10599 from ptibogxiv/patch-114 ... NEW link/delete contact in invoice API	2019-02-14 13:42:35 +01:00
Laurent Destailleur	372cad8adf	Merge pull request #10598 from ptibogxiv/patch-113 ... NEW link/delete contact in order API	2019-02-14 13:42:23 +01:00
Laurent Destailleur	52472531f1	Merge pull request #10597 from ptibogxiv/patch-112 ... Fix delete contact	2019-02-14 13:37:16 +01:00
Laurent Destailleur	42f754cbc0	Merge pull request #10596 from frederic34/patch-33 ... Update functionsnumtoword.lib.php	2019-02-14 13:33:03 +01:00
Laurent Destailleur	c4669c7fa5	Merge pull request #10595 from frederic34/patch-32 ... Update card.php	2019-02-14 13:32:43 +01:00
Laurent Destailleur	ce83db0585	Merge pull request #10594 from frederic34/patch-31 ... Update website.class.php	2019-02-14 13:32:22 +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	67c8ab47ea	Merge branch 'develop' into patch-21	2019-02-14 13:27:46 +01:00
Laurent Destailleur	6b00bb1a6f	Merge pull request #10583 from frederic34/patch-18 ... Update company.lib.php	2019-02-14 13:26:21 +01:00
Laurent Destailleur	518d42e309	Merge pull request #10572 from aspangaro/10.0_subledger ... NEW: Add employee/user to subledger account list	2019-02-14 13:24:59 +01:00
Laurent Destailleur	943f975806	Merge pull request #10580 from frederic34/patch-2 ... update doc in barcode.lib.php	2019-02-14 13:23:28 +01:00
Laurent Destailleur	70a6ee6749	Merge pull request #10582 from andreubisquerra/master ... Fix TakePOS categories bug	2019-02-14 13:23:12 +01:00
Laurent Destailleur	c59313a3cb	Merge pull request #10574 from aspangaro/10.0_menu ... FIX: Accountancy journal label menu on Auguria	2019-02-14 13:22:49 +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
Laurent Destailleur	5a0d4c4cdc	Merge branch 'develop' into patch-110	2019-02-14 10:32:05 +01:00
Regis Houssin	aa4c5ae839	FIX missing access security checking with multicompany	2019-02-14 10:12:15 +01:00
Laurent Destailleur	fbfb4ce566	FIX creation of new left menu entry	2019-02-14 10:10:31 +01:00
Laurent Destailleur	fabdf05f6f	Fix field date subscription not visible	2019-02-14 09:57:33 +01:00
ptibogxiv	7f3f166a81	NEW link/delete contact in invoice object	2019-02-14 00:44:40 +01:00
ptibogxiv	58a73e7b4c	Update api_orders.class.php	2019-02-14 00:42:00 +01:00
ptibogxiv	7ac47fabda	NEW link/delete contact in order object	2019-02-14 00:36:35 +01:00