Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-25 19:01:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
93,485 Commits 36 Branches 191 Tags
3801dd34cdb62b94de22b8ebb934b65e63b052b1
Commit Graph

362 Commits

Author SHA1 Message Date
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
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
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
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
Laurent Destailleur
dccdfd3a53 Merge pull request #14766 from ptibogxiv/patch-361 
FIx  product list
 2020-09-20 17:18:29 +02:00
Laurent Destailleur
0e4d3c19dd Fix escaping 2020-09-20 02:57:15 +02:00
Tobias Sekan
b2a953ed5b Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
eac9e54e0b fix more different button visibility 2020-09-18 11:48:53 +02:00
Laurent Destailleur
b35db6b9dd Clean code managing canvas 2020-09-18 06:02:52 +02:00
ptibogxiv
08d7973b4a Update list.php 2020-09-17 22:10:22 +02:00
ptibogxiv
cbd511fbb4 Update list.php 2020-09-17 16:16:35 +02:00
ptibogxiv
8284d0ee06 FIx product list 
fix mistake if fk_state empty
 2020-09-17 11:41:53 +02:00
Laurent Destailleur
5daba4b0ed Merge pull request #14752 from ptibogxiv/patch-360 
NEW filter product list by country and/or state/province
 2020-09-17 11:21:23 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
ptibogxiv
6f564c1937 NEW filter product list by country and/or state/province 2020-09-16 12:34:07 +02:00
Laurent Destailleur
b7b1de4580 Fix position of GPAO must be after Product. 
CSS
 2020-09-15 02:41:08 +02:00
Laurent Destailleur
0d124730a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/list.php
 2020-09-10 18:05:18 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Florian Mortgat
4a60725f6c FIX: round stock value on product list 2020-09-08 16:42:41 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
6f7b65d9f2 css 2020-08-07 20:44:49 +02:00
Laurent Destailleur
aa699bacc6 css 2020-08-07 20:10:31 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
stickler-ci
fd34908c17 Fixing style errors. 2020-07-24 11:42:18 +00:00
Romain DESCHAMPS
c370241afd add costprice in fields of the list 2020-07-24 13:40:06 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
b75700cc0b Fix virtualstock activation when MRP module is on 2020-06-05 10:27:34 +02:00
Laurent Destailleur
b6308f6dfa Fix phpcs 2020-05-26 01:16:18 +02:00