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

11099 Commits

Author SHA1 Message Date
Alexandre SPANGARO
d66540bf00 Revert "Split mod fournisseur" 
This reverts commit 78dbf4f7ff.
 2021-04-20 04:42:51 +02:00
Laurent Destailleur
4797c137e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-19 21:12:19 +02:00
Laurent Destailleur
294cf6cc31
Merge pull request #17312 from prietojc/patch-16 
Update bonprelevement.class.php
 2021-04-19 21:12:06 +02:00
Laurent Destailleur
d6df32eee9 Add invoice id into EndToEnd to guarantee unicity of value. 2021-04-19 21:10:53 +02:00
Laurent Destailleur
7988aaf88f
Update bonprelevement.class.php 2021-04-19 21:02:29 +02:00
Laurent Destailleur
61df76dd9a Fix pb in date format %a %b when using a negative timezone 
Enhance date management and unit tests.
 2021-04-19 12:48:08 +02:00
Laurent Destailleur
23b11491d2 Can filter also on payment mode 2021-04-19 11:11:01 +02:00
JC Prieto
4329b6b99b
Update bonprelevement.class.php 
Change facture reference by supplier reference
 2021-04-19 11:04:50 +02:00
Laurent Destailleur
83b5a325df Load of template before the loop. 2021-04-19 10:47:12 +02:00
Laurent Destailleur
a74b237a7b Add a schedule dtask to send reminder by email on date due. 2021-04-19 10:35:19 +02:00
Alexandre SPANGARO
78dbf4f7ff Split mod fournisseur 2021-04-17 07:49:19 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions 
Next picto mass actions
 2021-04-16 20:40:19 +02:00
Laurent Destailleur
aec2212b44
Merge pull request #17293 from cmfpmatik/cmfpmatik-patch-16042021 
Update facture list.php
 2021-04-16 20:39:23 +02:00
Oarces DEV
593e23220d
Update list.php 
Add filter for "Bill Short Status Draft" and "Bill Short Status Draft", that they has can be viewed together.
Secretaries appreciate having this overall visibility.
 2021-04-16 14:34:23 +02:00
Laurent Destailleur
db5dcd3e52 NEW When a doc file is shared, link is visible from main page of doc. 2021-04-15 17:56:55 +02:00
Laurent Destailleur
f1d55d38ba Show link to shared file if it exists. 2021-04-15 17:09:15 +02:00
Laurent Destailleur
754b0e9853 Debug v14 2021-04-15 15:30:02 +02:00
Laurent Destailleur
37fa8f4c19 Fix method not found 2021-04-15 15:07:06 +02:00
Laurent Destailleur
bd1aa38c64 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-04-15 12:04:08 +02:00
Laurent Destailleur
5e2bec9cad Look and feel v14 2021-04-15 02:09:29 +02:00
Laurent Destailleur
e7d64d073a Look and feel v14 2021-04-14 23:14:38 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Laurent Destailleur
4dfc90f8cb
Merge pull request #17256 from OGPayet/fix/ComptaFactureDateClosingOptionPosition 
fix date closing option position
 2021-04-13 23:03:02 +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
Pierre Payet
75ed5e45f2 fix date closing option position 2021-04-13 17:21:51 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +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
Laurent Destailleur
a68378da3f Fix #yogosha5840 2021-04-12 10:32:41 +02:00
Laurent Destailleur
97ace5e3bb Look and feel v14 2021-04-12 10:19:38 +02:00
Alexandre SPANGARO
80995c34b5 FIX Write right on document 2021-04-12 07:13:05 +02:00
Alexandre SPANGARO
80c6458faa Work on split module fournisseur 2021-04-11 22:25:45 +02:00
Laurent Destailleur
0ab31a8680 Look and feel v14 2021-04-11 13:30:30 +02:00
Laurent Destailleur
2d771704d0 Better suggestion for data after clone of social contribution 2021-04-09 00:36:08 +02:00
Laurent Destailleur
667481acd5 Fix #yogosha5832 - Missin test on permission for /index routes on APIs 2021-04-08 19:05:28 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35 
NEW: Add deposit on supplier invoice (& somes ajustments)
 2021-04-07 02:51:32 +02:00
Laurent Destailleur
2e862f815a Fix field total_ht 2021-04-07 00:44:01 +02:00
Laurent Destailleur
e23ddb383e css 2021-04-06 23:38:52 +02:00
Laurent Destailleur
7c27ab6121 Fix css 2021-04-06 23:35:30 +02:00
Laurent Destailleur
dbc1780817
Merge pull request #16376 from aspangaro/14a22 
Code enhanced - Standardize field name #14697
 2021-04-06 20:01:38 +02:00
Laurent Destailleur
e993d4e244
Merge pull request #17127 from dolibit-ut/patch-230 
Create index.html
 2021-04-06 19:32:24 +02:00
Laurent Destailleur
7c4c2deab3
Merge pull request #17128 from dolibit-ut/patch-231 
Create index.html
 2021-04-06 19:29:01 +02:00
Laurent Destailleur
a774a02452
Merge pull request #17129 from dolibit-ut/patch-232 
Create index.html
 2021-04-06 19:28:27 +02:00
Laurent Destailleur
60f6908d83
Merge pull request #17130 from dolibit-ut/patch-233 
Create index.html
 2021-04-06 19:28:12 +02:00
stickler-ci
1419b75f22 Fixing style errors. 2021-04-06 08:32:27 +00:00
Alexandre SPANGARO
36e4f5aa22 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
82b652df8a NEW: Add deposit on supplier invoice (& somes ajustments) 2021-04-06 09:15:34 +02:00
UT from dolibit
904dca335a
Create index.html 2021-04-05 20:24:06 +02:00
UT from dolibit
74cbf34d61
Create index.html 2021-04-05 20:22:41 +02:00
UT from dolibit
c35621a2e7
Create index.html 2021-04-05 20:20:10 +02:00
UT from dolibit
888dfdba4a
Create index.html 2021-04-05 20:19:23 +02:00
UT from dolibit
cd556d3dfc
Create index.html 2021-04-05 20:17:45 +02:00
Laurent Destailleur
a3fb8d3e14 Factorize code 2021-04-05 19:34:56 +02:00
Laurent Destailleur
01eec2b919 FIx #yogosha5774 2021-04-05 15:11:28 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Laurent Destailleur
231f441876 Look and feel v14 2021-04-03 02:11:16 +02:00
Laurent Destailleur
3fb69f8ec0 Fix report 2021-03-31 21:28:07 +02:00
Laurent Destailleur
0fd36d96f3 Fix report 2021-03-31 21:25:01 +02:00
Laurent Destailleur
2af8b7078c Fix turnover calculation was wrong. We must include only 2021-03-31 19:50:43 +02:00
Laurent Destailleur
e01b6b6789 FIX filter on date on invoice list 2021-03-31 18:39:59 +02:00
Laurent Destailleur
2e3af575be Look and feel v14 2021-03-31 18:12:26 +02:00
Laurent Destailleur
27bc05a039 Debug report accountancy 2021-03-31 17:59:42 +02:00
Laurent Destailleur
32f9a04776 FIX Must use the server TZ for accounting report 2021-03-31 17:37:45 +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
8be7ffb519
Merge pull request #17043 from dolibit-ut/patch-198 
Update card.php
 2021-03-31 13:42:09 +02:00
Laurent Destailleur
7641f7258b
Merge pull request #17044 from aspangaro/14a27 
FIX: Add a sub table to manage accountancy on product/company
 2021-03-31 13:39:17 +02:00
Gauthier PC portable 024
c27c52331a FIX : default value 2021-03-31 10:34:21 +02:00
Gauthier PC portable 024
19265179ca FIX : last uniformizations 2021-03-31 10:11:51 +02:00
Alexandre SPANGARO
38d47c184e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 22:12:57 +02:00
UT from dolibit
ba84a36282
Update card.php 
$help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas|DE:Modul_Banken_und_Barbestände';
 2021-03-30 22:12:13 +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
fb7cfe6c50 Fix sql error 2021-03-30 19:15:20 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:45:15 +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
d61f61ab45 Clean $_GET 2021-03-30 03:55:17 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
32bec56529 Using " for html is better 2021-03-29 23:14:42 +02:00
Laurent Destailleur
b702d2b534 Fix CSRF for more GET 2021-03-29 22:58:44 +02:00
Laurent Destailleur
0740633ec8
Update facture-rec.class.php 2021-03-29 20:42:59 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Laurent Destailleur
5bbfe7ed19
Merge pull request #16930 from aspangaro/14a27 
NEW: Add a sub table to manage accountancy on product/company
 2021-03-29 20:11:02 +02:00
Laurent Destailleur
93627012cd
Merge pull request #16995 from atm-gauthier/fix_list_uniformization 
FIX : display debug if !$conf->banque->enabled
 2021-03-29 18:02:58 +02:00
Laurent Destailleur
f4b0723f30
Update list.php 2021-03-29 17:41:19 +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
Laurent Destailleur
36dfcc0646
Merge pull request #16976 from atm-florianm/NEW_14.0_hooks_on_CA_by_product_report 
WIP: NEW 14.0 - SQL-altering hooks in the turnover by product report
 2021-03-29 17:18:17 +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
5c2ee240b2 FIX #yogosha5752 2021-03-29 15:59:37 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Laurent Destailleur
6bc56b7671 Look and feel v14 2021-03-29 13:41:28 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00
Laurent Destailleur
a5d84200dc Clean code for invoice list 2021-03-28 19:22:04 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Alexandre SPANGARO
22f809c517 Move to _PERENTITY 2021-03-27 05:23:20 +01:00
Alexandre SPANGARO
6422b0a6c0 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-27 05:02:55 +01: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
Gauthier PC portable 024
f5bf26e5d0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization 2021-03-26 09:59:27 +01:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Florian Mortgat
d17256bde5 NEW 14.0 - hook printFieldListTitle for cabyprodserv.php 2021-03-25 16:14:44 +01:00
Florian Mortgat
3c8e15a87c NEW 14.0 - SQL-altering hooks in the turnover by product report 2021-03-25 15:12:25 +01:00
Laurent Destailleur
663138328e
Merge pull request #16962 from atm-gauthier/fix_autofill_amount_payment_salary 
FIX : autofill payment salary amount + several fixes
 2021-03-25 13:03:38 +01:00
Gauthier PC portable 024
014ae0a8da FIX : lists uniformization 2021-03-25 11:59:22 +01:00
Gauthier PC portable 024
368bad1943 FIX : autofill payment salary amount + several fixes 2021-03-25 10:39:12 +01:00
Gauthier PC portable 024
155978f2d2 FIX : Must be a left join here to be able to see vat declarations even if no payments are done 2021-03-25 09:29:53 +01:00
Gauthier PC portable 024
a20bb3d66e Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_special_expense_index 2021-03-25 09:15:42 +01:00
Laurent Destailleur
ce422f514f Fix title of reports 2021-03-25 00:47:05 +01:00
Laurent Destailleur
eeba9e4d50 Code comment 2021-03-24 21:58:06 +01:00
Laurent Destailleur
21a9779fe2 FIX inconsistency in margin recording with option "Force to sale price" 2021-03-24 21:49:45 +01:00
Laurent Destailleur
047471c220 Remove $_POST war 2021-03-24 19:06:44 +01:00
Gauthier PC portable 024
8ffb40035f FIX : old query using tva object for payments list 2021-03-24 17:29:16 +01:00
Laurent Destailleur
2d5fbfc105 Fix php8 2021-03-22 23:43:28 +01:00
Laurent Destailleur
146706bafa Fix label 2021-03-22 19:11:29 +01:00
Laurent Destailleur
ca0a04fb61 Fix missing payment ref 2021-03-22 18:56:02 +01:00
Laurent Destailleur
cce4ebdb8c Clean code 2021-03-22 18:50:47 +01:00
Laurent Destailleur
f405505e0f Do not load each invoice of payment for tooltip 2021-03-22 18:34:01 +01:00
Laurent Destailleur
010b084444 Do not load each invoice of payment for tooltip 2021-03-22 18:32:36 +01:00
Laurent Destailleur
5a8d757a30 Add missing data 2021-03-22 18:23:29 +01:00
Laurent Destailleur
5d6fb0cfea Perf: Enhance performance of VAT report 2021-03-22 18:11:44 +01:00
Laurent Destailleur
897d653144 Debug default date for vat reports 2021-03-22 16:09:18 +01:00
Laurent Destailleur
4ff26bd8c5 Removed deprecated code 2021-03-22 13:39:34 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
stickler-ci
5af4b4673c Fixing style errors. 2021-03-21 22:12:36 +00:00
Alexandre SPANGARO
0c2ada4299 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-21 23:08:01 +01:00
Laurent Destailleur
1c6585f06b Fix deprecated function 2021-03-21 22:37:24 +01:00
Laurent Destailleur
eeb1c5d884 Replace deprecated code 2021-03-20 21:46:10 +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
e334e83a64
Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Laurent Destailleur
d8aa5f5eab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-20 12:43:07 +01:00
Laurent Destailleur
3d3a7bfd37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/projet/card.php
	htdocs/projet/contact.php
	htdocs/projet/element.php
	htdocs/projet/tasks.php
	htdocs/projet/tasks/comment.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/document.php
	htdocs/projet/tasks/note.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2021-03-20 12:42:46 +01:00
Laurent Destailleur
7f6044c52e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/projet/card.php
	htdocs/projet/contact.php
	htdocs/projet/tasks/comment.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/document.php
	htdocs/projet/tasks/task.php
 2021-03-20 12:18:40 +01:00
Laurent Destailleur
4c811d462c
Merge pull request #16837 from dolibit-ut/patch-129 
Update document.php
 2021-03-20 11:50:20 +01:00
Laurent Destailleur
668519e7f5
Merge pull request #16836 from dolibit-ut/patch-128 
Update card.php
 2021-03-20 11:49:57 +01:00
Laurent Destailleur
827a952dca
Merge pull request #16839 from dolibit-ut/patch-130 
Update card.php
 2021-03-20 11:49:18 +01:00