lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
118,535 Commits 43 Branches 150 Tags 886 MiB
e36ed66c07
Commit Graph

780 Commits

Author SHA1 Message Date
Marc de Lima Lucio
ef624ec5bc NEW: deposit payment terms: add field into dictionary admin page 2021-09-29 11:34:30 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
470eec7f50 Remove (hide) not used field "deductible" on social contributions. 2021-08-06 11:32:39 +02:00
Laurent Destailleur
4ada220083 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
 2021-07-07 19:18:32 +02:00
Laurent Destailleur
2acbdc2c80 Fix avoid error message 2021-07-07 18:51:00 +02:00
Laurent Destailleur
9308fab7ca Fix css for field pos/position in dictionary. 
Conflicts:
	htdocs/admin/dict.php
 2021-07-07 18:46:11 +02:00
Laurent Destailleur
6cfb3c0e16 Fix css for field pos/position in dictionary. 2021-07-07 18:41:37 +02:00
Laurent Destailleur
9d3f7c5cdd Support fk_parent into dictionary of ticket categories 2021-07-07 18:30:10 +02:00
Laurent Destailleur
3c0e841877 Fix function not found 2021-07-06 15:55:43 +02:00
Laurent Destailleur
37801184c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/holiday/class/holiday.class.php

Fix case of newByMonth
 2021-07-06 15:35:17 +02:00
Laurent Destailleur
a72f66b456 Fix: dictionnaries are edited per entity 2021-06-13 16:32:06 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Marc de Lima Lucio
30e0471451 NEW: leave requests: add field into type dictionary to block request if balance is negative 2021-06-10 23:04:56 +02:00
Laurent Destailleur
46a06f8e95 Fix phpcs 2021-06-06 16:37:45 +02:00
Laurent Destailleur
9f177a0c63 Debug v14 2021-06-06 16:36:41 +02:00
TuxGasy
56bb2bbd14 On dict, test $obj->code if empty before translation 2021-06-04 17:10:26 +02:00
TuxGasy
2fdd8486c9 No try to translate label field in dictionary for new 2021-05-22 06:13:16 +02:00
Laurent Destailleur
f51e892a97 Fix phpcs 2021-05-18 02:06:35 +02:00
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
 2021-05-17 19:50:10 +02:00
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
 2021-05-17 10:47:00 +02:00
Laurent Destailleur
985301939d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 10:31:25 +02:00
Ferran Marcet
f923c70f38 Fix: Before there was no mistake 2021-05-17 10:17:54 +02:00
Laurent Destailleur
2f9a504dce Fix label 2021-05-17 09:30:09 +02:00
Laurent Destailleur
7bb71dd89f FIX #17602 2021-05-17 09:25:18 +02:00
Laurent Destailleur
af2f40cc18 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-05-17 09:19:31 +02:00
Laurent Destailleur
892a38e681 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 09:15:21 +02:00
Ferran Marcet
c577d1c51e FIX: Impossible to add multiple localtax2 2021-05-13 13:35:28 +02:00
Laurent Destailleur
457050f1c5 Add pen to edit dictionary 2021-05-06 18:45:20 +02:00
Laurent Destailleur
b8b6919cb0 Fix label of dictionaries 2021-05-06 18:41:27 +02:00
Laurent Destailleur
3e34557066 Clean code 2021-05-06 18:36:02 +02:00
Laurent Destailleur
6159321bed NEW Show picto of module into the list of dictionaries 2021-05-06 18:31:36 +02:00
Laurent Destailleur
6b825cbc3b Clean code 2021-05-06 18:06:19 +02:00
Laurent Destailleur
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +02:00
altairis-noe
38bba5dddc Merge branch 'develop' into batch_status_dict 2021-04-29 13:13:41 +02:00
altairis-noe
b04afc1753 merge conflict resolution 2021-04-29 13:08:24 +02:00
altairis-noe
762f41ea86 llx_c_productbatch_qcstatus as dictionnary name 2021-04-29 12:49:15 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
altairis-noe
07cd751c59 batch status dictionnary 2021-04-20 15:51:02 +02:00
Laurent Destailleur
ea97992c3d css 2021-04-19 22:52:13 +02:00
Givriz
0a0804e7d5 Update dict.php 2021-04-15 16:36:17 +02:00
Givriz
47cdfee1d2 Compatibility pvpv8 2021-04-14 22:03:04 +02:00
Alexandre SPANGARO
bbd774f987 Work on split module fournisseur 2021-04-12 05:50:57 +02:00
Laurent Destailleur
eed14ad6e1 Fix missing token 2021-03-31 23:15:33 +02:00
Laurent Destailleur
d61f61ab45 Clean $_GET 2021-03-30 03:55:17 +02:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
37c04b794f Add property "ticket group is public" in dicitonary of ticket groups. 2021-03-24 12:13:23 +01:00
Frédéric FRANCE
608b933ef5
code syntax admin dir 2021-02-26 22:04:03 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2021-02-08 22:13:50 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-02-08 17:25:05 +01:00
Laurent Destailleur
9f9ace0565 FIX Localtax must be converted with price2num 2021-02-07 22:15:21 +01:00
Laurent Destailleur
6d0cbd3ee5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-23 17:32:49 +01:00
Laurent Destailleur
f2c4e25827 Clean code 2021-01-23 17:32:14 +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
19ee163f31 Fix add ticket on elementList 2021-01-06 13:54:51 +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
9764f086d3 Fix Field code is mandatory but not field note in tax dictionary 2021-01-05 14:31:14 +01:00
Alexandre SPANGARO
9f0434eb69 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-12-29 04:50:32 +01:00
Laurent Destailleur
e7306625f0 Fix look and feel v13 2020-12-04 15:28:12 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +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
Alexandre SPANGARO
61bca50fa6 NEW: Dictionary for availability - Add column position 2020-11-05 16:56:28 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-27 18:46:07 +00:00
Laurent Destailleur
335d1db3a6
Update dict.php 2020-10-25 14:43:33 +01:00
bahfir abbes
3f03b678e9 fix:rowid is string in currencies table 2020-10-24 03:47:10 +01:00
Frédéric FRANCE
78ec68e2cf
code field for product nature must be numeric 2020-10-23 00:04:55 +02:00
Laurent Destailleur
e3552e7e02 Clean code 2020-10-16 20:17:54 +02:00
Laurent Destailleur
bb367a4489
Update dict.php 2020-10-14 17:40:27 +02:00
Florian HENRY
7d09f22afa add correct import and dict edition 2020-10-14 16:39:42 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +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
c2fed95dc4 FIX #14877 2020-10-02 19:54:06 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Alexandre SPANGARO
3c35b20b54 Dict - Insert number 41 2020-08-16 22:17:28 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Laurent Destailleur
d9818405c6 Fix regression for v13 2020-08-02 22:30:23 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Frédéric FRANCE
85625a46bb
add new rule 2020-05-21 09:35:30 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
ff8d22a80d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:57:01 +02:00
Laurent Destailleur
762ca96203 FIX #13841 2020-05-15 18:28:15 +02:00
Tobias Sekan
56dee72b66
add tooltip for unit_type and scale (admin) 2020-04-29 13:30:14 +02:00
kamel
9cb90cb384 NEW: Add prospect status managment for the contact with managment of custom icon 2020-04-27 17:35:14 +02:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +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
Laurent Destailleur
8e7ad726b2 NEW Easier way to setup the different types of tax. Better visibility. 
FIX edit of tax stamp regenerated the PDF.
 2020-04-07 14:06:08 +02:00
Alexandre SPANGARO
bac099dc60 Merge remote-tracking branch 'upstream/develop' into 12.0_a23 2020-03-19 11:48:21 +01:00
Alexandre SPANGARO
033f796398 Work on split module fournisseur 2020-03-17 14:51:48 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2020-03-04 01:56:50 +01:00
atm-ph
e916ff40ff Fix sql syntax error 2020-03-03 11:55:05 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
5b87b12e64 FIX Vulnerability reported by code16 2020-02-16 18:06:25 +01:00
Alexandre SPANGARO
d6d3fff9dc Merge branch 'develop' into 10.0_intracommreport 2020-02-03 21:15:07 +01:00
Laurent Destailleur
bd322dc12e Fix search on country 2020-02-02 12:59:11 +01:00
Laurent Destailleur
553107258e Fix alignement 2020-01-22 17:00:54 +01:00
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Laurent Destailleur
2aac4b382f
Merge pull request #12372 from OPEN-DSI/fix-admin-dict-transkey-not-defined 
FIX var transkey not defined in input hidden
 2019-11-07 12:56:21 +01:00
Laurent Destailleur
f29a176423
Merge pull request #12357 from frederic34/patch-19 
can't edit socialnetwork dict
 2019-11-07 11:41:57 +01:00
VESSILLER
146fa461c1 FIX var transkey not defined in input hidden 2019-11-07 11:36:17 +01:00
Frédéric FRANCE
6bd90b7e0a
can't edit socialnetwork dict 2019-11-06 07:29:43 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Frédéric FRANCE
360bf55f5b
clean indent 2019-10-20 01:09:11 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Frédéric FRANCE
02b706f9c0
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-09 13:40:46 +02:00
fuhraih
8aee2fa534
Update dict.php 2019-10-08 15:48:18 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-02 18:59:18 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 12:25:34 +02:00
Laurent Destailleur
35fdaaf355 Fix bad key for type of contact of resources 2019-10-01 11:33:43 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
bf6fd2a5e2 Translate & style 2019-09-20 09:25:46 +02:00
Alexandre SPANGARO
278312f38f Translate 2019-09-20 07:02:14 +02:00
Frédéric FRANCE
6f33874d75
add entity 2019-09-12 21:13:00 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary 2019-09-11 22:27:09 +02:00
Laurent Destailleur
8381b93e80 Fix init of public holidays 2019-09-09 11:06:54 +02:00
Laurent Destailleur
37a32af7b0 NEW Add dictionary to store public holidays. 2019-09-05 20:19:13 +02:00
Laurent Destailleur
df6472254d Fix var not defined 2019-08-31 13:31:08 +02:00
Laurent Destailleur
00660d4885 Fix responsive 2019-08-12 02:52:36 +02:00
Laurent Destailleur
49e2f447a8 Fix responsive 2019-08-12 02:41:27 +02:00
Alexandre SPANGARO
2c74caff90 WIP 2019-07-22 06:56:55 +02:00
Laurent Destailleur
fe89e158fe Fix: Avoid deletion of system entries in dictionary 2019-07-19 04:03:33 +02:00
Laurent Destailleur
2afefada40 Fix: Avoid deletion of system entries in dictionary 2019-07-19 04:02:42 +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
John Botella
a75a2ae8e4 Fix missing hidden input and short label 2019-07-02 15:44:42 +02:00
Laurent Destailleur
afb6362317 Fix look and feel v10 
Fix link to direct debit payment order
 2019-06-20 13:37:06 +02:00
Laurent Destailleur
a7ca177100 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-14 13:58:19 +02:00
Laurent Destailleur
239e41f6c4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-14 13:57:49 +02:00
atm-florian.m
787e1319b9 FIX: in edit mode, dictionary inputs do not escape the string inside the 'value' attribute, causing errors if there are any double quotes 2019-06-13 16:21:07 +02:00
Laurent Destailleur
9115df7439 Debug v10 2019-05-03 11:25:53 +02:00
Philippe GRAND
644743dce8 update with html5 compliant code 2019-03-20 09:47:06 +01:00
Laurent Destailleur
e67890bd22 NEW Can enter price with or without tax when entering expense repor line 2019-03-07 11:09:04 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
Frédéric FRANCE
48de805bce
replace html code by html5 in admin 2019-02-23 21:57:35 +01:00
Laurent Destailleur
3050366372 Fix table of units already exists. Merge duplicate c_measuring_units 
with c_units.
 2019-02-14 13:02:44 +01:00
florian HENRY
5b5f96bafb NEW : measuring unit dictionnary and product size/unit import 2019-02-12 16:58:11 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Philippe GRAND
1cda3106b2 update with html5 compliant code 2019-01-31 12:40:50 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00