Commit Graph

89109 Commits

Author SHA1 Message Date
ptibogxiv
4177c72ae0
Update facture.class.php 2019-09-29 15:46:28 +02:00
ptibogxiv
2e8b99606e
Update facture.class.php 2019-09-29 15:45:41 +02:00
ptibogxiv
5a096972c0
Update list.php 2019-09-29 15:42:39 +02:00
ptibogxiv
f132f2f947
Update 10.0.0-11.0.0.sql 2019-09-29 15:40:26 +02:00
ptibogxiv
d0b06a1eab
Update llx_facture.sql 2019-09-29 15:39:59 +02:00
ATM john
e5f1379ef3 Fix css 2019-09-29 13:10:39 +02:00
ATM john
37f476bd8f Add shortcut , searchable items and list 2019-09-29 12:51:27 +02:00
Frédéric FRANCE
05f3d86921
fix? 2019-09-29 11:48:53 +02:00
ATM john
cc1d490135 Prepare dropdown bookmark menu 2019-09-29 11:47:34 +02:00
Frédéric FRANCE
1b151da776
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-29 11:28:54 +02:00
Frédéric FRANCE
6c8dc75c96
socialnetworks for thirdparties 2019-09-29 11:20:23 +02:00
stickler-ci
103efbbe5b Fixing style errors. 2019-09-28 20:55:58 +00:00
Alexandre SPANGARO
8e42ac8cd0 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-28 22:31:08 +02:00
Laurent Destailleur
2b57d486dc NEW Upgrade ACE editor to v1.4.6 2019-09-28 13:50:32 +02:00
Laurent Destailleur
a19fd8507e Trans 2019-09-28 13:47:51 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Laurent Destailleur
db32ca99c6 Fix translation and sql request 2019-09-28 12:36:09 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +02:00
Laurent Destailleur
e7beadb58a Remove duplicate 2019-09-28 10:42:58 +02:00
Frédéric FRANCE
2eaf3c0dda
Add sendcontext to notification emails 2019-09-28 10:25:00 +02:00
Frédéric FRANCE
710154fb9d
Update box_supplier_orders_awaiting_reception.php 2019-09-28 09:00:52 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
fuhraih
5757159c30 FIX #7533 Infinite loop in Agenda per user view if workinghours not set
correctly
Remove the spaces in the Working_hours and Working_days stored
2019-09-27 22:29:12 +02:00
obrunet
3e4e64ab1a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2019-09-27 21:36:35 +02:00
ATM john
d7d5b87cf2 Fix lang loaded 2019-09-27 21:29:55 +02:00
fuhraih
40a8fe3e79 FIX #11554 Extrafields: members autosubscription formular issue 2019-09-27 21:26:06 +02:00
florian HENRY
f1d098adcc fix remove error dispplaying 2019-09-27 20:15:11 +02:00
florian HENRY
885d958e63 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-27 20:12:09 +02:00
Laurent Destailleur
fd37a81e19 FIX #11861 2019-09-27 20:02:33 +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
18055bc425 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-27 17:51:34 +02:00
Laurent Destailleur
46e019642f Code comment 2019-09-27 17:51:22 +02:00
stickler-ci
a8e73533b9 Fixing style errors. 2019-09-27 13:43:11 +00:00
Tim Otte
10f7bd3494 Restricted query of ExtraFields for supplier orders 2019-09-27 15:42:57 +02:00
Laurent Destailleur
0cd0ed3d8a
Merge pull request #11903 from erpware/docker-11815
Added hint for setting up database (issue #11815)
2019-09-27 15:38:15 +02:00
Laurent Destailleur
ea62ea8c70
Merge pull request #11901 from ptibogxiv/patch-263
NEW: delete purchase price API
2019-09-27 15:37:21 +02:00
Laurent Destailleur
7a733ff283
Merge pull request #11921 from OPEN-DSI/fix-resource-event-move-check-busy
FIX check if a resource is in use after a drag and drop from events
2019-09-27 15:36:53 +02:00
Laurent Destailleur
c5e7413ed2
Merge branch 'develop' into fix-resource-event-move-check-busy 2019-09-27 15:35:14 +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
a4d405c6f9
Merge pull request #11906 from OPEN-DSI/new-form-products-select-labels-units
NEW Add units in select products lines
2019-09-27 15:30:44 +02:00
Laurent Destailleur
07b555b965
Merge branch 'develop' into patch-255 2019-09-27 15:23:15 +02:00
VESSILLER
5f08a649eb FIX empty cache when we want to load specific warehouses in select
Conflicts:
	htdocs/product/class/html.formproduct.class.php
2019-09-27 15:10:05 +02:00
Laurent Destailleur
8ef227f24a
Merge pull request #11902 from OPEN-DSI/fix-formproduct-select-warehouses-cache
FIX empty cache when we want to load specific warehouses in select
2019-09-27 14:59:14 +02:00
Laurent Destailleur
edade506ee
Merge pull request #11908 from atm-john/fix_missing_col_tags
Fix missing expedition table cols line's tags
2019-09-27 14:58:13 +02:00
Laurent Destailleur
e3edb37620 Fix escape db 2019-09-27 14:54:23 +02:00
madx666
4b3430a1dc Fix return to list on page 1
When are on page 1 on any list and we go on an object, when return to the list, we are back on page 0
2019-09-27 14:53:11 +02:00