Laurent Destailleur
|
6da3ed1a51
|
Merge 2 exclusive options into 1
|
2021-01-07 12:39:51 +01:00 |
|
Florian HENRY
|
dfaf77b03f
|
merge develop
|
2021-01-03 15:14:34 +01:00 |
|
Laurent Destailleur
|
2ae1aac5a4
|
Fix setup
|
2020-12-15 11:18:29 +01:00 |
|
Laurent Destailleur
|
31693eed21
|
Fix setup was not clear
|
2020-12-15 11:10:35 +01:00 |
|
Laurent Destailleur
|
d0cb9bc4ed
|
Debug price_rule page.
|
2020-12-01 02:34:24 +01:00 |
|
Laurent Destailleur
|
fa8b960520
|
Clean code
|
2020-11-30 13:22:48 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Florian HENRY
|
46326d7659
|
merge from develop
|
2020-11-19 13:53:34 +01:00 |
|
Frédéric FRANCE
|
d9bf49c5dc
|
phpcs
|
2020-10-31 21:04:38 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
stickler-ci
|
284c9bc6a8
|
Fixing style errors.
|
2020-10-31 13:34:01 +00: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
|
d77a0b40a8
|
tested and approuve feaure #15036
|
2020-10-28 16:37:41 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Scrutinizer Auto-Fixer
|
1512521d91
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-07 13:01:28 +00:00 |
|
Laurent Destailleur
|
7b3a7c9921
|
Add token on all url with action=delete
|
2020-10-01 10:50:54 +02:00 |
|
Laurent Destailleur
|
f442dac2c9
|
Add token on most GET url for admin action
|
2020-09-30 15:13:28 +02:00 |
|
Laurent Destailleur
|
0e4d3c19dd
|
Fix escaping
|
2020-09-20 02:57:15 +02:00 |
|
Laurent Destailleur
|
216b3c885d
|
Fix escaping
|
2020-09-20 01:30:36 +02:00 |
|
Laurent Destailleur
|
0bf0312d50
|
FIX #yogosha4448
|
2020-09-17 12:30:14 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
5ea47f3ade
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
|
2020-07-08 18:11:58 +02:00 |
|
Laurent Destailleur
|
7d7ef1e72a
|
FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY
Fix setup of product
|
2020-07-06 15:34:26 +02:00 |
|
Anthony Berton
|
bda4753e41
|
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
|
2020-06-11 18:44:38 +02:00 |
|
Laurent Destailleur
|
a59961dae6
|
Fix td alignment
|
2020-06-05 23:06:59 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
a25ed0e041
|
add new rule
|
2020-05-21 01:56:06 +02:00 |
|
Anthony Berton
|
06c08ad045
|
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
|
2020-05-14 15:26:58 +02:00 |
|
Laurent Destailleur
|
3dbe9a4af1
|
Fix label
|
2020-05-06 13:59:15 +02:00 |
|
stickler-ci
|
56a5e8ca3c
|
Fixing style errors.
|
2020-05-03 17:50:10 +00:00 |
|
Anthony Berton
|
485ef522d2
|
Add option HT TTC créate product
|
2020-05-03 19:47:10 +02:00 |
|
Laurent Destailleur
|
a88ab40384
|
Clean phpcs
|
2020-05-02 15:18:59 +02:00 |
|
Laurent Destailleur
|
1c70e49695
|
Merge branch 'develop' into 12.0_a23
|
2020-04-27 14:14:13 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Alexandre SPANGARO
|
5528e9ef38
|
Work on split module fournisseur
|
2020-03-24 22:02:58 +01:00 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Scrutinizer Auto-Fixer
|
e44865d8b5
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-21 16:53:37 +00:00 |
|
Scrutinizer Auto-Fixer
|
fd48877dc6
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-18 22:47:25 +00:00 |
|
Laurent Destailleur
|
f4f3efec62
|
Fight against $_POST
|
2020-02-16 19:33:58 +01:00 |
|
atm-greg
|
f8ffdea5ae
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging
|
2020-02-06 09:59:42 +01:00 |
|
Laurent Destailleur
|
38de69f5a9
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
|
2020-01-04 14:20:25 +01:00 |
|
Regis Houssin
|
71a2998118
|
FIX wrong var name and avoid warning
|
2019-12-30 15:36:09 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
stickler-ci
|
5d051cc901
|
Fixing style errors.
|
2019-11-25 07:08:22 +00:00 |
|
atm-greg
|
ce15af0980
|
manage packaging on supplier prices
|
2019-11-23 15:52:34 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
496f93911f
|
Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
|
2019-11-02 16:19:13 +01:00 |
|
Laurent Destailleur
|
d79114c1f8
|
Clean code
|
2019-10-20 15:16:40 +02:00 |
|
Frédéric FRANCE
|
7581275316
|
wip
|
2019-10-20 11:59:21 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Tim Otte
|
54d0b94b6d
|
Added extrafield support to the product supplier price lines
|
2019-09-04 15:13:42 +02:00 |
|
Laurent Destailleur
|
fa53641221
|
Merge pull request #11551 from atm-quentin/NEW_global_search_product
NEW Add hidden option to set fields for the quick search on products
|
2019-08-15 20:26:05 +02:00 |
|
Laurent Destailleur
|
8647a20c18
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
htdocs/product/stats/facture.php
|
2019-08-10 01:57:43 +02:00 |
|
Regis Houssin
|
0b831ccdf7
|
FIX better help message with multicompany
|
2019-08-09 09:33:14 +02:00 |
|
atm-quentin
|
bd2f5ba037
|
FIX Replace conf by hidden conf editable by user
|
2019-07-26 14:16:54 +02:00 |
|
Laurent Destailleur
|
0c6499f193
|
Update product.php
|
2019-07-25 18:01:47 +02:00 |
|
Laurent Destailleur
|
9a0e0fbdd2
|
Update product.php
|
2019-07-25 18:01:16 +02:00 |
|
atm-quentin
|
03ed4eb141
|
modif rowspan
|
2019-07-24 09:42:39 +02:00 |
|
atm-quentin
|
5a385bf1cc
|
ADD extrafields on global search
|
2019-07-24 09:41:02 +02:00 |
|
Laurent Destailleur
|
2fee41f712
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-04 12:27:00 +02:00 |
|
Laurent Destailleur
|
8e3620fce1
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
|
2019-07-04 12:26:17 +02:00 |
|
atm-quentin
|
8cdb251ca5
|
FIX product_use_units was set to 0 each time a conf in block other was set
|
2019-07-02 10:18:03 +02:00 |
|
Laurent Destailleur
|
a7bd734ece
|
Rename ->produit into ->product. Still permissions to rename.
|
2019-06-24 21:18:49 +02:00 |
|
Laurent Destailleur
|
d152354022
|
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield
NEW add extrafields in warehouses
|
2019-06-20 03:16:49 +02:00 |
|
Laurent Destailleur
|
08d5ca4ddb
|
Debug page to export accounting documents
|
2019-06-17 17:53:43 +02:00 |
|
Lionel VESSILLER
|
9a974814fa
|
NEW add extrafields in warehouses
- fix load lang stocks
|
2019-06-03 15:53:21 +02:00 |
|
Lionel VESSILLER
|
439eafb637
|
NEW add extrafields in warehouses
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
|
2019-06-03 15:44:17 +02:00 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
Laurent Destailleur
|
e463b17c15
|
Fix look and feel v10
|
2019-05-21 15:31:56 +02:00 |
|
Laurent Destailleur
|
a94c291b76
|
Dolibarization
|
2019-05-09 16:59:06 +02:00 |
|
Philippe GRAND
|
6bdac445c5
|
update with html5 compliant code
|
2019-03-15 09:50:53 +01:00 |
|
Philippe GRAND
|
89da4fbdc1
|
update with html5 compliant code
|
2019-03-15 09:49:07 +01:00 |
|
Philippe GRAND
|
7c916666a6
|
update with html5 compliant code
|
2019-03-15 09:48:32 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Laurent Destailleur
|
b515511ad6
|
Merge branch 'develop' into FunctionDeclaration
|
2018-08-16 00:52:55 +02:00 |
|
Frédéric FRANCE
|
7bb781eea8
|
function declaration
|
2018-08-15 14:28:34 +02:00 |
|
Philippe GRAND
|
e35da2f84d
|
Standardize code
|
2018-08-14 09:55:58 +02:00 |
|
atm-greg
|
ad5f59822e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
|
2018-08-07 09:33:30 +02:00 |
|
atm-greg
|
fc705e8510
|
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
|
2018-08-07 09:31:41 +02:00 |
|
atm-greg
|
08273612d9
|
create field without migration
|
2018-08-06 17:21:20 +02:00 |
|
atm-greg
|
a8b33a1710
|
New fields desc_supplier on product_fourn_prices
|
2018-08-06 16:26:25 +02:00 |
|
Philippe GRAND
|
ff04cb64c0
|
Clean and update code
|
2018-07-25 15:36:50 +02:00 |
|
Philippe GRAND
|
74704acbcb
|
clean and update code
|
2018-07-18 16:13:13 +02:00 |
|
Laurent Destailleur
|
982a1ffbaf
|
NEW Automatic position of scroll when creating an extrafield
|
2018-06-30 14:22:05 +02:00 |
|
Philippe GRAND
|
a952b46d8b
|
clean and update code
|
2018-06-27 12:37:31 +02:00 |
|
Frédéric FRANCE
|
58e5715ac3
|
loadlangs
|
2018-05-26 17:57:30 +02:00 |
|
Frédéric FRANCE
|
efbb053e54
|
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
|
2018-05-23 17:05:08 +02:00 |
|
Laurent Destailleur
|
04934cc4aa
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
|
2018-02-27 19:18:43 +01:00 |
|
Laurent Destailleur
|
6bec121c9f
|
Use name of var
|
2018-02-27 13:26:57 +01:00 |
|
Laurent Destailleur
|
41638e6dff
|
Fix back link of look and feel v7
|
2018-02-26 09:20:05 +01:00 |
|