Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
78,966 Commits 36 Branches 189 Tags
c8ab03432b1df37e93a09a8febdfc9e27ba70d9c
Commit Graph

78966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stickler-ci
c8ab03432b Fixing style errors. 2019-09-29 17:59:12 +00:00
ATM john
455dd279e3 Add hidden conf 2019-09-29 19:54:25 +02:00
ATM john
5e4694cc35 Drop down position and behavior 2019-09-29 19:46:41 +02:00
ATM john
cd821261e8 Add global search dropdown 2019-09-29 18:56:28 +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
ATM john
cc1d490135 Prepare dropdown bookmark menu 2019-09-29 11:47:34 +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
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
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
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
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
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
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
Laurent Destailleur
34aa64bae2 Update element.php 2019-09-27 12:36:15 +02:00
Laurent Destailleur
2eaa910336 Update project.class.php 2019-09-27 12:32:27 +02:00
Laurent Destailleur
ed99b71df4 Merge pull request #11915 from frederic34/patch-12 
Update CMailFile.class.php
 2019-09-27 12:26:55 +02:00
Laurent Destailleur
7f9ea2e223 Merge pull request #11929 from atm-florian/9.0 
fix regex main.inc.php warning
 2019-09-27 12:26:24 +02:00
Laurent Destailleur
72ea1a2867 Merge pull request #11927 from OPEN-DSI/fix-fournisseur-product-display-histo-tooltip 
FIX dol_print_date format in buying price tooltip
 2019-09-27 12:25:26 +02:00
Laurent Destailleur
29c8ef6c27 Merge pull request #11947 from atm-john/develop_dashboard_global_stat_basic_auto_removed 
New : dashboard global stat basic auto removed
 2019-09-27 12:22:24 +02:00