Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
96,756 Commits 36 Branches 189 Tags
49faedae6fef9775b889a063921ee252aa06ffad
Commit Graph

387 Commits

Author SHA1 Message Date
Laurent Destailleur
7d122cf921 Merge pull request #16838 from hregis/fix_php8 
FIX php 8 warning
 2021-03-20 11:49:41 +01:00
Laurent Destailleur
1540f62df0 FIX #yogosha5678 2021-03-19 14:25:59 +01:00
Regis Houssin
b5905bb032 FIX php 8 warning 2021-03-19 09:34:40 +01:00
Laurent Destailleur
b42da41041 Merge pull request #16639 from fbosman/patch-5 
Update list.php wrong number presentation in stock
 2021-03-19 00:01:54 +01:00
Frédéric FRANCE
afafe81d8a fix php8 warning 2021-03-17 21:36:47 +01:00
Frans Bosman
ba4fd3d44f Update list.php 2021-03-15 13:44:40 +01:00
stickler-ci
f68bbdcf45 Fixing style errors. 2021-03-13 07:46:46 +00:00
Frans Bosman
dcb7958be9 Update list.php 
Changed the presentation of the stock to show decimals and thousands separator. changes price2num to price and use MAIN_MAX_DECIMALS_STOCK
 2021-03-13 08:44:16 +01:00
Christophe Battarel
83350cde8f remove hidden constant MAIN_ADVANCE_NUMLOT 2021-03-04 15:40:23 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Frédéric FRANCE
96b0f3a25c code syntax directory 2021-02-26 16:19:52 +01:00
Frédéric FRANCE
8029a3317f Merge remote-tracking branch 'upstream/develop' into product_code_syntax 2021-02-26 16:11:34 +01:00
Laurent Destailleur
b95fd1697f Merge pull request #16434 from altairisfr/serials_pr 
differentiate serial numbers from lot management
 2021-02-26 15:06:35 +01:00
Frédéric FRANCE
fa7cd70052 code syntax product directory 2021-02-26 14:25:17 +01:00
Laurent Destailleur
2670d4fc17 Look and feel v14 2021-02-26 11:00:58 +01:00
Christophe Battarel
75298b4ac6 fix for stickler 2021-02-25 16:00:42 +01:00
Christophe Battarel
a61fa2b049 differentiate serial numbers from lot management 2021-02-25 15:15:00 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
b553dbb9d2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:23:07 +01:00
Laurent Destailleur
3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php
 2021-01-06 20:20:37 +01:00
jpb
2be2cdaadf fix style errors 2021-01-06 16:06:03 +01:00
jpb
99b977a08e add categories params on llxHeader filter 2021-01-06 15:38:30 +01:00
Laurent Destailleur
ba68c958e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 19:12:57 +01:00
Laurent Destailleur
01062c5940 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/list.php
 2021-01-05 19:12:22 +01:00
Laurent Destailleur
58e33c59f4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/list.php
 2021-01-05 19:07:53 +01:00
lvessiller
ca6899c138 FIX right to show VAT rate in product list 2021-01-05 16:11:46 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Laurent Destailleur
81ab33ff12 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/product/list.php
 2020-12-27 19:40:03 +01:00
Florian HENRY
f03574d061 bank ok 2020-12-24 14:56:26 +01:00
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
f8ef2a352f Merge branch '12.0' into 13.0 2020-12-23 23:51:02 +01:00
Florian HENRY
7d1d588225 fix service right problem for mass action 2020-12-23 23:48:45 +01:00
Florian HENRY
055a2b6fec on goung 2020-12-23 23:44:38 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
stickler-ci
89759174dd Fixing style errors. 2020-11-25 09:45:04 +00:00
Regis Houssin
a0dcbb3b79 FIX missing "price_base_type" and refactor to include cache 2020-11-25 10:40:38 +01:00
Laurent Destailleur
e35c745838 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/list.php
 2020-11-24 13:41:46 +01:00
Laurent Destailleur
faa33f2d3c FIX #15501 2020-11-24 12:52:39 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Regis Houssin
265d19f563 FIX better method to preserve order 2020-11-20 08:07:44 +01:00
Regis Houssin
524aa96880 FIX to preserve order of multiprices fields 2020-11-19 14:14:43 +01:00
lvessiller
4ddff7173f NEW include tpl for loading lang file for extra fields in list 2020-11-06 12:19:45 +01:00
Laurent Destailleur
dd97ae94d0 css 2020-11-05 11:24:33 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Florian HENRY
7d09f22afa add correct import and dict edition 2020-10-14 16:39:42 +02:00
Laurent Destailleur
e3542c6d4f Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights 
NEW Show category filter on lists only when user have rights to read categories
 2020-10-06 12:29:10 +02:00
Sekan, Tobias
2bf15b3a92 Show category filter only on rights to read it 2020-09-28 10:42:49 +02:00
Laurent Destailleur
6f919f1dd0 Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 20:02:48 +02:00
Laurent Destailleur
09c6761dae NEW Include the tag editor of page as a popup into website editor 2020-09-23 16:36:19 +02:00
Tobias Sekan
a72519f353 Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00