Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 13:31:28 +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
0180014d4d Fix link in popup of shipment 2019-10-23 01:35:32 +02:00
Laurent Destailleur
d25af2d199 Show dimensions of product on the tooltip on product reference 2019-10-23 01:29:07 +02:00
Laurent Destailleur
887a5a43d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-22 20:25:30 +02:00
Laurent Destailleur
fea12076ee FIX #12152 2019-10-22 20:24:52 +02:00
Laurent Destailleur
2f0b791cfe Merge pull request #12202 from atm-gauthier/10.0_fix_search_on_product_and_service 
FIX : if we search something with global search, and after with form …
 2019-10-22 20:06:10 +02:00
Laurent Destailleur
1cd1152290 Merge pull request #12193 from dolibarr95/patch-56 
NEW: package sql data
 2019-10-22 19:25:32 +02:00
Laurent Destailleur
5d9e7215ae Merge pull request #12203 from grandoc/new_branch_22_10_2019 
Internationalization
 2019-10-22 19:24:23 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
 2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
stickler-ci
5ab6228adb Fixing style errors. 2019-10-22 15:12:42 +00:00
Philippe GRAND
ce255b6f36 Merge remote-tracking branch 'origin/new_branch_22_10_2019' into new_branch_22_10_2019 2019-10-22 17:12:06 +02:00
Philippe GRAND
9b2905fb43 Typo and comment 2019-10-22 17:10:52 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
stickler-ci
e807cb6b03 Fixing style errors. 2019-10-22 15:00:58 +00:00
stickler-ci
c176044379 Fixing style errors. 2019-10-22 14:26:26 +00:00
Philippe GRAND
4dd5c00ec0 Internationalization 2019-10-22 16:25:10 +02:00
gauthier
44ced0cbeb FIX : if we search something with global search, and after with form fields, we want to stay on Products AND Services list 2019-10-22 16:11:59 +02:00
dolibarr95
d0a599a1d8 Reduce the $companystatic calls 2019-10-22 15:51:30 +02:00
Laurent Destailleur
22a14e7bf7 Fix closig tag 2019-10-22 15:40:29 +02:00
Laurent Destailleur
6079a4d159 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/main.lang
 2019-10-22 15:25:31 +02:00
Laurent Destailleur
84c8b6b5d1 FIX #12198 2019-10-22 15:23:23 +02:00
Laurent Destailleur
f9c86256dc FIX #12198 2019-10-22 15:21:41 +02:00
Laurent Destailleur
8242281ef8 Close #12096 2019-10-22 14:39:33 +02:00
Laurent Destailleur
24174a0eea Merge pull request #12201 from c3do/develop 
Fix getListOfShipmentMethods
 2019-10-22 14:05:22 +02:00
dolibarr95
af8f5948f0 Package tables 
llx_expedition_package and llx_c_shipment_package_type
 2019-10-22 13:54:50 +02:00
Laurent Destailleur
5a50dce82e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-22 13:52:29 +02:00
Laurent Destailleur
f0844222ed Work on MRP 2019-10-22 13:52:18 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
ptibogxiv
c3fac0b8c9 Update llx_adherent_type.sql 2019-10-22 12:52:41 +02:00
ptibogxiv
d77215c40e Update llx_adherent_type.sql 2019-10-22 12:52:14 +02:00
Cédric
d098efb8fe getListOfShipmentMethods: Add rowid field in sql select 2019-10-22 12:52:08 +02:00
Cédric
07bb968a9c Merge pull request #1 from Dolibarr/develop 
sync 20191022
 2019-10-22 12:47:25 +02:00
Laurent Destailleur
8aacfcdfbd Merge branch 'develop' into patch-234 2019-10-22 12:46:39 +02:00
Laurent Destailleur
a4eab82894 Merge pull request #12191 from andreubisquerra/master 
NEW Multiple payments in a TakePOS sale
 2019-10-22 12:45:19 +02:00
Laurent Destailleur
6638b361d4 Update invoice.php 2019-10-22 12:44:19 +02:00
Laurent Destailleur
b2bbee55f1 Fix phpcs 2019-10-22 12:37:36 +02:00
Laurent Destailleur
2eb5803644 Merge pull request #12196 from bb2a/patch-2 
Update functions.lib.php
 2019-10-22 12:36:47 +02:00
Laurent Destailleur
1ba9c31b37 Add migration of index 2019-10-22 12:34:03 +02:00
Laurent Destailleur
fc0d7d2694 Merge pull request #12197 from openthink-laurent/add-index-fk-origin-line-column-llx-expeditiondet-table 
Add index on fk_origin_line column of llx_expeditiondet table
 2019-10-22 12:33:17 +02:00
Laurent Destailleur
9be9f912af Merge pull request #12192 from Ahuahuachi/develop 
Translate documentation and minor code improvement
 2019-10-22 12:32:40 +02:00
Laurent Destailleur
e5ee83ead1 Merge pull request #12194 from grandoc/new_branch_21_10_2019 
internationalization
 2019-10-22 12:31:48 +02:00
Tim Otte
ad51e862e4 Merged 2019-10-22 11:39:32 +02:00
Tim Otte
ceb3482204 Requested changes implemented 2019-10-22 11:36:28 +02:00
Laurent Léonard
b5aab50194 Add index on fk_origin_line column of llx_expeditiondet table 2019-10-22 06:07:11 +02:00
Laurent Destailleur
aa4afcfe8a NEW Can set a filter on object linked in modulebuilder. 2019-10-22 03:49:09 +02:00
Laurent Destailleur
c5490e22d1 Fiw trans 2019-10-22 02:58:55 +02:00
Laurent Destailleur
6aa2ceac1a Fix phpcs 2019-10-22 02:53:29 +02:00
Laurent Destailleur
2fb521667c Doc 10.0.3 2019-10-22 02:42:08 +02:00
Laurent Destailleur
1c6df393a7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/supplier/index.php
 2019-10-22 02:41:10 +02:00
Laurent Destailleur
6205913056 FIX CVE-2019-17578 CVE-2019-17577 CVE-2019-17576 2019-10-22 02:35:54 +02:00