Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 08:21:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

81180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Laurent Destailleur
13473be6e9 Merge pull request #11923 from frederic34/patch-14 
Update box_contacts.php to see email
 2019-09-27 12:16:06 +02:00
Laurent Destailleur
138b494b98 Merge pull request #11936 from aspangaro/11.0_translation 
Translate and some fix
 2019-09-27 12:15:50 +02:00
Laurent Destailleur
8ffd69fc21 Merge pull request #11926 from com4WEB/patch-2 
Update README.md
 2019-09-27 12:15:17 +02:00
Laurent Destailleur
0aea902681 Merge pull request #11958 from altatof/clipboard 
NEW : add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant
 2019-09-27 12:14:09 +02:00
Laurent Destailleur
de11801792 Merge pull request #11971 from ATM-Marc/FIX_8.0_shipping_errors 
FIX: shipping card: missing user error messages when classifying closed or billed
 2019-09-27 11:56:43 +02:00
Laurent Destailleur
881c90ab74 Merge pull request #11953 from grandoc/new_branch_24_09_2019 
add missing translation
 2019-09-27 11:56:01 +02:00
Laurent Destailleur
f96c9c3bb5 FIX #11931 #11963 2019-09-27 11:51:34 +02:00
Alexandre SPANGARO
e38bb89a2e NEW Add fa_icon on load_fiche_titre 2019-09-27 11:48:40 +02:00
Laurent Destailleur
6c3d191727 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-27 11:39:12 +02:00
Laurent Destailleur
99ed34b6a4 Fix escape db 2019-09-27 11:39:02 +02:00