lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
111,448 Commits 43 Branches 150 Tags 886 MiB
724490b94d
Commit Graph

711 Commits

Author SHA1 Message Date
Laurent Destailleur
9db9c5eecd Fix tooltip 2021-12-18 15:34:12 +01:00
Laurent Destailleur
d0bc32047d FIX Create and clone negative social contribution 2021-12-13 18:11:17 +01:00
Laurent Destailleur
1caaa335d1 Fix missing section with files on social contribution page 2021-12-06 18:18:31 +01:00
Laurent Destailleur
47f32ef19b NEW Can modify amount when cloning a social contribution 2021-11-15 19:40:26 +01:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Alexandre SPANGARO
12eb16b8b6 Merge branch '15a12' of https://github.com/aspangaro/dolibarr into 15a12 2021-09-09 22:24:42 +02:00
Alexandre SPANGARO
3ea6314494 Remove $year 2021-09-09 22:24:24 +02:00
stickler-ci
dfe1576b8d Fixing style errors. 2021-09-09 20:18:47 +00:00
Alexandre SPANGARO
f31b7fa3c4 NEW Social Contributions - Add from/to on list 2021-09-09 22:14:26 +02:00
Laurent Destailleur
6089de568e Fix sort order 2021-09-07 23:15:06 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
67db0f1bdb Add link "Now" on date selection when cloning social contribution 2021-09-02 19:15:21 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
abb1ad6bf0 Fix sql injection 2021-07-05 18:46:27 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Alexandre SPANGARO
9b0988e7be FIX Social contrib. - Missing language file 2021-05-18 08:40:28 +02:00
Gauthier PC portable 024
ae1586fcc6 FIX : We must not be able to delete sociale charge, vat or salary if there are payments 2021-04-26 10:48:50 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Alexandre SPANGARO
80995c34b5 FIX Write right on document 2021-04-12 07:13:05 +02:00
Laurent Destailleur
2d771704d0 Better suggestion for data after clone of social contribution 2021-04-09 00:36:08 +02:00
UT from dolibit
904dca335a
Create index.html 2021-04-05 20:24:06 +02:00
Laurent Destailleur
231f441876 Look and feel v14 2021-04-03 02:11:16 +02:00
Laurent Destailleur
cf57826a5e Trans 2021-03-31 16:57:58 +02:00
Laurent Destailleur
f2f0e4a6fd css 2021-03-31 16:47:36 +02:00
Laurent Destailleur
d5cc006250 Look and feel v14 2021-03-31 16:45:53 +02:00
Laurent Destailleur
47e9f7c458
Merge pull request #17032 from atm-gauthier/fix_develop 
FIX : several fix after lists uniformization
 2021-03-30 19:20:15 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Gauthier PC portable 024
3259d70e72 FIX : several fix after lists uniformization 2021-03-30 17:23:05 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
b732a82c3d
Update list.php 2021-03-29 17:40:36 +02:00
stickler-ci
e1e3bcbf28 Fixing style errors. 2021-03-29 15:26:24 +00:00
Gauthier PC portable 024
139a1ba70d FIX : if $conf->banque->enabled 2021-03-29 17:22:19 +02:00
Gauthier PC portable 024
28620fe8d8 Merge branch 'fix_list_uniformization' of github.com:atm-gauthier/dolibarr into fix_list_uniformization 2021-03-29 16:27:59 +02:00
Gauthier PC portable 024
53ae1f9d5b Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization 2021-03-29 16:27:44 +02:00
stickler-ci
caa56729b3 Fixing style errors. 2021-03-29 14:25:36 +00:00
Gauthier PC portable 024
c8e40727c2 FIX : uniformization 2021-03-29 16:22:22 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00
stickler-ci
895c6efc14 Fixing style errors. 2021-03-26 15:26:05 +00:00
Gauthier PC portable 024
f553ad3fc8 FIX : orders columns 2021-03-26 16:14:00 +01:00
Gauthier PC portable 024
3fe1a05f26 FIX : employee must be after label as well as sociale charges list + social charges payments list must use INNER JOIN instead of LEFT JOIN 2021-03-26 10:23:44 +01:00
Laurent Destailleur
047471c220 Remove $_POST war 2021-03-24 19:06:44 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
f95aa9c6e1
Merge pull request #16612 from atm-adrien/FIX/develop_update_pencil 
FIX : Update pencil
 2021-03-20 19:54:47 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
 2021-03-16 14:57:04 +01:00
Laurent Destailleur
f514dec6ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
 2021-03-16 14:50:06 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Adrien Raze
83b06734a2 FIX : Travis return 2021-03-10 15:34:43 +01:00
stickler-ci
3a9c1613bf Fixing style errors. 2021-03-10 14:12:29 +00:00
Adrien Raze
0bd4b132a4 FIX : Update pencil should be shoxn only when no payment has been entered 2021-03-10 14:39:04 +01:00
atm-lena
b798535af9 FIX create sociales : keep values error form 2021-03-10 14:15:03 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00
Laurent Destailleur
7cb10eae2e
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation 
FIX : Add "Now" link on social charges creation card
 2021-03-08 16:31:41 +01:00
Laurent Destailleur
20c30bade8
Update card.php 2021-03-08 16:30:32 +01:00
Adrien Raze
67c6577177 FIX : Add "Now" link on social charges card creation 2021-03-08 15:47:02 +01:00
Adrien Raze
cbb7751a15 FIX : rounding amount on card updating 2021-03-08 11:51:18 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries 
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 2021-03-04 16:53:54 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Laurent Destailleur
0832c25b5b Look and feel v14 2021-02-28 11:48:35 +01:00
Gauthier PC portable 024
c996871f98 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 11:50:18 +01:00
Frédéric FRANCE
61600a9e65
code syntax compta directory 2021-02-23 21:09:01 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Gauthier PC portable 024
134d7e00ec Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-17 16:56:50 +01:00
Laurent Destailleur
c8824ccea0 Look and feel v14 2021-02-16 17:05:38 +01:00
stickler-ci
84e17753eb Fixing style errors. 2021-02-11 10:35:15 +00:00
atm-lena
a1356718c0 Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser 2021-02-11 11:14:24 +01:00
atm-lena
7fbf0b56d5 NEW Bank Entries : add verif fk_user addPaymentToBank Social Contribution 2021-02-11 11:13:12 +01:00
atm-lena
b83e2dc77a Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser 2021-02-11 09:52:59 +01:00
atm-lena
8f8f5058de Add link 'user' in bank_url for payment_sc 2021-02-10 16:04:29 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Laurent Destailleur
964fa7a72d Look and feel v14 2021-02-04 20:29:57 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Laurent Destailleur
dad6778570 Prepare removal of libelle and lib into label 2021-01-31 13:07:41 +01:00
Gauthier PC portable 024
b55cb826e7 Merge branch 'NEW_develop/fk_user_on_social_charge' of github.com:atm-gauthier/dolibarr into NEW_develop/fk_user_on_social_charge 2021-01-29 09:33:06 +01:00