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 |
|
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 |
|
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 |
|
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 |
|
Laurent Destailleur
|
add3abc73d
|
Merge pull request #11905 from madx666/patch-1
Fix return to list on page 1
|
2019-09-27 14:51:06 +02:00 |
|
Laurent Destailleur
|
f4ef3e09c8
|
Merge pull request #11909 from frederic34/patch-4
cannot display icon arrow_selected
|
2019-09-27 14:46:57 +02:00 |
|
Laurent Destailleur
|
66cbb4020b
|
Merge branch 'develop' into patch-4
|
2019-09-27 14:46:39 +02:00 |
|
Laurent Destailleur
|
c198bd2462
|
Merge pull request #11910 from frederic34/patch-10
NEW Add more complete info for triggers actioncom
|
2019-09-27 14:45:39 +02:00 |
|
Laurent Destailleur
|
34813a931f
|
Merge branch 'develop' into patch-10
|
2019-09-27 14:45:09 +02:00 |
|
Laurent Destailleur
|
f90bfb54d4
|
Merge pull request #11913 from frederic34/actioncommcarddoaction
add doaction to actioncommcard
|
2019-09-27 14:34:49 +02:00 |
|
Laurent Destailleur
|
f5c839217a
|
Merge pull request #11914 from fmarcet/develop
Fix: Load invoices only if showed
|
2019-09-27 14:34:16 +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 |
|
Alexandre SPANGARO
|
4b73e09c60
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-27 14:20:53 +02:00 |
|
Laurent Destailleur
|
acfceecda5
|
Merge pull request #11925 from OPEN-DSI/new-product-fournisseurs-units
NEW add units fields in buying price tab of product card
|
2019-09-27 14:17:52 +02:00 |
|
Laurent Destailleur
|
1360652b5a
|
Merge pull request #11944 from oscim/patch-5
Update livraison.class.php
|
2019-09-27 14:13:13 +02:00 |
|
Laurent Destailleur
|
fc59193123
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-27 14:11:28 +02:00 |
|
Laurent Destailleur
|
f3bc319a78
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
|
2019-09-27 14:11:14 +02:00 |
|
Laurent Destailleur
|
da35e3d7cd
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-09-27 14:07:35 +02:00 |
|
Laurent Destailleur
|
6d1a571aed
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/product/dynamic_price/class/price_parser.class.php
|
2019-09-27 14:07:11 +02:00 |
|
Laurent Destailleur
|
5d45638248
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-09-27 14:02:23 +02:00 |
|
Laurent Destailleur
|
6de173494b
|
Merge pull request #11924 from frederic34/patch-15
Update box_fournisseurs.php to see email
|
2019-09-27 14:01:18 +02:00 |
|
Laurent Destailleur
|
9bf952cae5
|
Merge pull request #11938 from ptibogxiv/patch-265
FIX new display for stripe account
|
2019-09-27 14:00:55 +02:00 |
|
Laurent Destailleur
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Laurent Destailleur
|
a79c4608d6
|
Merge pull request #11934 from atm-quentin/NEW_stock_categories
NEW Categories/Tags are also available on warehouses
|
2019-09-27 12:41:28 +02:00 |
|
Laurent Destailleur
|
ab33665f7b
|
Merge pull request #11950 from laudeco/hotfix/11881-remove-referent
[FIX][#11881] - remove referent from the project
|
2019-09-27 12:37:16 +02:00 |
|
Laurent Destailleur
|
412e0f193b
|
Update element.php
|
2019-09-27 12:36:53 +02:00 |
|