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 |
|
Laurent Destailleur
|
3edeb8b4aa
|
Merge pull request #16840 from dolibit-ut/patch-131
Update document.php
|
2021-03-20 11:49:06 +01:00 |
|
Laurent Destailleur
|
ba6f97acbc
|
Merge pull request #16865 from frederic34/uniformisecomment
uniformise comments to remove nested comments
|
2021-03-20 11:24:39 +01:00 |
|
Laurent Destailleur
|
11a7420b59
|
Merge pull request #16877 from frederic34/patch-27
fix doxygen
|
2021-03-20 11:12:33 +01:00 |
|
Frédéric FRANCE
|
3d3715f55d
|
fix doxygen
|
2021-03-20 10:37:51 +01:00 |
|
Frédéric FRANCE
|
81c885dbf1
|
fix doxygen
|
2021-03-20 10:36:53 +01:00 |
|
Frédéric FRANCE
|
bae1770176
|
uniformise comments to remove nested comments
|
2021-03-20 10:00:24 +01:00 |
|
Frédéric FRANCE
|
2de2f1ce4d
|
fix nested comments for doxygen
|
2021-03-20 09:02:29 +01:00 |
|
Alexandre SPANGARO
|
17d3b85ec4
|
Merge remote-tracking branch 'upstream/develop' into 14a27
|
2021-03-20 07:47:54 +01:00 |
|
Alexandre SPANGARO
|
00e21caa42
|
NEW: Add a sub table to manage accountancy on product/company
|
2021-03-20 07:42:16 +01:00 |
|
Laurent Destailleur
|
ae7261c0a7
|
FIX #yogosha5677
|
2021-03-19 14:12:08 +01:00 |
|
Laurent Destailleur
|
d83d005284
|
FIX #yogosha5674
|
2021-03-19 12:44:59 +01:00 |
|
Laurent Destailleur
|
ebf409f831
|
FIX #yogosha5668
|
2021-03-19 12:08:40 +01:00 |
|
UT from dolibit
|
46c23807e9
|
Update document.php
$helpurl -> $help_url
|
2021-03-19 09:38:33 +01:00 |
|
UT from dolibit
|
b4e929e57f
|
Update card.php
$helpurl -> $help_url
|
2021-03-19 09:36:49 +01:00 |
|
UT from dolibit
|
6e6609d876
|
Update document.php
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
llxHeader("", $title, $help_url);
|
2021-03-19 09:33:10 +01:00 |
|
UT from dolibit
|
e5f8ca77a9
|
Update card.php
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
llxHeader("", $title, $help_url);
|
2021-03-19 09:30:28 +01:00 |
|
Laurent Destailleur
|
a200f6f6ea
|
Merge pull request #16785 from frederic34/fixextrafieldsadmin
fix php8 warning
|
2021-03-18 23:08:15 +01:00 |
|
Laurent Destailleur
|
3522af926a
|
Merge pull request #16799 from AlexisLaurier/addInvoiceListHook
invoice list - add new standard hooks
|
2021-03-18 22:58:18 +01:00 |
|
Laurent Destailleur
|
43494df56c
|
Merge pull request #16790 from AlexisLaurier/addGetNomUrlToInvoice
add invoice getNomUrl hook
|
2021-03-18 22:57:37 +01:00 |
|
Laurent Destailleur
|
9ba568eb25
|
Fix security check
|
2021-03-18 20:57:50 +01:00 |
|
Laurent Destailleur
|
461d748f97
|
Fix #yogosha235
|
2021-03-18 20:27:36 +01:00 |
|
Alexandre SPANGARO
|
18d247026d
|
NEW: Add a sub table to manage product/societe
|
2021-03-18 17:08:55 +01:00 |
|
Alexis LAURIER
|
5b72193f0d
|
invoice list - ajust hooks
|
2021-03-18 17:06:49 +01:00 |
|
Alexis LAURIER
|
ada5d728b5
|
invoice list - ajust hooks
|
2021-03-18 17:00:57 +01:00 |
|
Alexis LAURIER
|
06bc999614
|
Add group by and having hooks on invoice list
|
2021-03-18 16:51:02 +01:00 |
|
Alexis LAURIER
|
c3f8e0e397
|
invoice list - add new standard hook
|
2021-03-18 16:21:54 +01:00 |
|
Laurent Destailleur
|
640f5f6051
|
FIx #yogosha5661
|
2021-03-18 14:41:48 +01:00 |
|
Laurent Destailleur
|
46972ec669
|
FIx #5660
|
2021-03-18 14:34:44 +01:00 |
|
Laurent Destailleur
|
d2ef4b0506
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/bankentries_list.php
htdocs/opensurvey/card.php
htdocs/opensurvey/index.php
htdocs/opensurvey/results.php
|
2021-03-18 12:24:34 +01:00 |
|
Alexis LAURIER
|
b416223194
|
fix
|
2021-03-18 11:16:49 +01:00 |
|
Alexis LAURIER
|
c33347b461
|
add invoice getNomUrl hook
|
2021-03-18 11:10:43 +01:00 |
|
Frédéric FRANCE
|
75cf5e3599
|
fix php8 warning
|
2021-03-17 23:55:46 +01:00 |
|
Laurent Destailleur
|
73e55f1b73
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-17 18:44:47 +01:00 |
|
Laurent Destailleur
|
0da5c89973
|
Look and feel v14
|
2021-03-17 18:24:37 +01:00 |
|
Laurent Destailleur
|
1f9d4eca3d
|
Merge pull request #16746 from frederic34/patch-8
fix php8 warnings
|
2021-03-17 17:00:22 +01:00 |
|
Laurent Destailleur
|
22ed95a629
|
Look and feel v14
|
2021-03-16 19:09:56 +01:00 |
|
Laurent Destailleur
|
26dc3ef1b0
|
FIX Filter on debit/credit
Conflicts:
htdocs/compta/bank/bankentries_list.php
|
2021-03-16 18:59:28 +01:00 |
|
Laurent Destailleur
|
9ea7c92b1b
|
FIX Filter on debit/credit
|
2021-03-16 18:56:10 +01:00 |
|
Frédéric FRANCE
|
519b08b782
|
fix php8 warnings
|
2021-03-16 18:25:25 +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
|
26931a7e52
|
Merge pull request #16705 from dolibit-ut/patch-86
Update card.php
|
2021-03-16 10:36:27 +01:00 |
|
Laurent Destailleur
|
8a23d515e9
|
Merge pull request #16715 from frederic34/patch-12
fix php8 warning
|
2021-03-16 10:31:09 +01:00 |
|
Laurent Destailleur
|
e00e6cfd9a
|
Merge pull request #16721 from aspangaro/14a25
Translation "Generated documents"
|
2021-03-16 10:25:31 +01:00 |
|
Alexandre SPANGARO
|
6960f0dc25
|
Uniformize translation
|
2021-03-16 04:22:55 +01:00 |
|
Alexandre SPANGARO
|
03481a0197
|
Uniformize translation
|
2021-03-16 04:22:43 +01:00 |
|
Alexandre SPANGARO
|
4fd24c6855
|
Translation "Generated documents"
|
2021-03-16 04:04:18 +01:00 |
|
Alexandre SPANGARO
|
6e17a588bb
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-16 03:26:28 +01:00 |
|
Frédéric FRANCE
|
50cd8274a5
|
fix php8 warning
|
2021-03-15 21:07:30 +01:00 |
|
UT from dolibit
|
7b8d2e55b7
|
Update card.php
$helpurl = "EN:Module_Banks_and_Cash";
|
2021-03-15 19:46:51 +01:00 |
|
Laurent Destailleur
|
dfda1bfa0d
|
Merge pull request #16686 from frederic34/patch-5
fix php8 warning
|
2021-03-15 17:16:52 +01:00 |
|
Frédéric FRANCE
|
99cd866eba
|
fix php8 warning
|
2021-03-15 15:12:10 +01:00 |
|
Frédéric FRANCE
|
691b8d5976
|
fix php8 warning
|
2021-03-15 14:05:05 +01:00 |
|
Laurent Destailleur
|
3964801d40
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2021-03-15 13:26:20 +01:00 |
|
Laurent Destailleur
|
85eaec48e1
|
Merge pull request #16307 from aspangaro/14a15
NEW: VAT report - Optimisation & collapse by rate
|
2021-03-15 11:56:06 +01:00 |
|
Laurent Destailleur
|
a1cfacfa9e
|
Merge pull request #16652 from frederic34/patch-9
fix php8 warnings
|
2021-03-15 11:09:23 +01:00 |
|
Laurent Destailleur
|
6de5ef286d
|
Merge pull request #16668 from frederic34/patch-23
fix php8 warning
|
2021-03-15 11:00:07 +01:00 |
|
Laurent Destailleur
|
c2c434ab7f
|
Update quadri_detail.php
|
2021-03-15 10:59:41 +01:00 |
|
Laurent Destailleur
|
909653c65e
|
Update byratecountry.php
|
2021-03-15 10:56:10 +01:00 |
|
Frédéric FRANCE
|
c15f2ea4dc
|
fix php8 warning
|
2021-03-15 00:26:50 +01:00 |
|
Laurent Destailleur
|
382b810ba1
|
Fix phpcs
|
2021-03-15 00:18:26 +01:00 |
|
Frédéric FRANCE
|
bfd954b91e
|
fix php8 warning
|
2021-03-14 23:51:49 +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 |
|
Frédéric FRANCE
|
f5ae12f4dc
|
fix php8 warnings
|
2021-03-14 09:41:53 +01:00 |
|
Laurent Destailleur
|
c75fade649
|
Fix regression
|
2021-03-10 17:07:44 +01:00 |
|
Adrien Raze
|
83b06734a2
|
FIX : Travis return
|
2021-03-10 15:34:43 +01:00 |
|
Laurent Destailleur
|
c209d9b45e
|
Update paiement_charge.php
|
2021-03-10 15:29:05 +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 |
|
Alexandre SPANGARO
|
b5c84bfc4f
|
Resolve some mistakes
|
2021-03-09 05:02:37 +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 |
|
Laurent Destailleur
|
7bd93aa3ad
|
Fix price format
|
2021-03-08 14:31:02 +01:00 |
|
Laurent Destailleur
|
8184e34de4
|
Merge pull request #16587 from ATM-Consulting/NEW/12.0_new_payments_on_vat
FIX : Rounding amount on VAT card updating
|
2021-03-08 14:29:29 +01:00 |
|
Adrien Raze
|
cbb7751a15
|
FIX : rounding amount on card updating
|
2021-03-08 11:51:18 +01:00 |
|
x
|
e087c6ffe0
|
FIX : Rounding amount on card updating
|
2021-03-08 11:35:59 +01:00 |
|
Laurent Destailleur
|
ab89d85095
|
Fix for php8
|
2021-03-08 11:33:07 +01:00 |
|
Alexandre SPANGARO
|
2f86971f84
|
Merge remote-tracking branch 'upstream/develop' into 14a15
|
2021-03-08 09:56:57 +01:00 |
|
Laurent Destailleur
|
4d409e23f5
|
Missing declaration of properties
|
2021-03-08 09:16:33 +01:00 |
|
Laurent Destailleur
|
a1d97274fb
|
Clean code for php8
|
2021-03-08 09:14:23 +01:00 |
|
Alexandre SPANGARO
|
339af419bc
|
Fix strftime
|
2021-03-07 21:59:28 +01:00 |
|
Laurent Destailleur
|
1affaa8c87
|
fix phpunit
|
2021-03-07 20:26:36 +01:00 |
|
Laurent Destailleur
|
1ca3e433d2
|
Fix phpunit
|
2021-03-07 19:55:09 +01:00 |
|
Laurent Destailleur
|
0f7085154b
|
Fix phpunit
|
2021-03-07 19:47:55 +01:00 |
|
Laurent Destailleur
|
91245e22d4
|
Fix phpunit phpv8
|
2021-03-07 19:16:09 +01:00 |
|
Laurent Destailleur
|
63aa2f4ec2
|
Fix phpunit
|
2021-03-06 12:50:38 +01:00 |
|
Laurent Destailleur
|
7959bc99d7
|
Fix phpcs
|
2021-03-06 10:39:51 +01:00 |
|
Laurent Destailleur
|
3cbced439a
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/compta/bank/line.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/paiement/cheque/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/ticket.lib.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/core/tpl/extrafields_view.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/cron/list.php
htdocs/expedition/card.php
htdocs/mrp/mo_list.php
htdocs/product/stock/productlot_card.php
htdocs/public/emailing/mailing-read.php
htdocs/public/emailing/mailing-unsubscribe.php
htdocs/ticket/list.php
test/phpunit/FactureRecTest.php
|
2021-03-05 19:29:09 +01:00 |
|
Laurent Destailleur
|
6eafc3b774
|
Clean code
|
2021-03-04 17:23:12 +01:00 |
|
Laurent Destailleur
|
10a6774ede
|
Merge pull request #16534 from atm-lena/develop_FIX_OrderBy_UserThirdParty_BankEntries
Bank Entries : Error order by user/thirdparty
|
2021-03-04 17:08:12 +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 |
|
atm-lena
|
cd1c1c54d4
|
Merge branch 'FIX_BankEntries_OrderByUserSoc' of github.com:atm-lena/dolibarr into develop_FIX_OrderBy_UserThirdParty_BankEntries
|
2021-03-04 11:50:08 +01:00 |
|
atm-lena
|
0cce782a21
|
No orderby for user/thirdparty in bankentries list
|
2021-03-04 11:42:47 +01:00 |
|
Laurent Destailleur
|
31845e1dae
|
Fix phpcs
|
2021-03-04 00:04:43 +01:00 |
|
Laurent Destailleur
|
6503c81f47
|
FIX #16530
|
2021-03-03 23:55:28 +01:00 |
|
Laurent Destailleur
|
30dd4ac6ec
|
FIX #16530
|
2021-03-03 22:52:02 +01:00 |
|
Laurent Destailleur
|
71370bd558
|
Fix links in cheque receipt pages
|
2021-03-03 21:18:14 +01:00 |
|
stickler-ci
|
e1159f422a
|
Fixing style errors.
|
2021-03-03 13:11:01 +00:00 |
|
Alexandre SPANGARO
|
59a2fb8ed5
|
Merge remote-tracking branch 'upstream/develop' into 14a15
|
2021-03-03 14:08:40 +01:00 |
|
Laurent Destailleur
|
f11a85a3e3
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
|
2021-03-03 11:37:34 +01:00 |
|
Laurent Destailleur
|
7eb3e324c7
|
FIX #16503
|
2021-03-02 23:09:55 +01:00 |
|
Laurent Destailleur
|
42329b10c9
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
|
2021-03-02 15:27:20 +01:00 |
|
Laurent Destailleur
|
acb7b30eb0
|
Merge pull request #16507 from frederic34/add_rule
Add rule
|
2021-03-02 12:52:03 +01:00 |
|
stickler-ci
|
35cb48d649
|
Fixing style errors.
|
2021-03-02 11:37:46 +00:00 |
|
Laurent Destailleur
|
1d642f49f7
|
Update facture.class.php
|
2021-03-02 12:37:24 +01:00 |
|
Florian HENRY
|
d063533efb
|
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
|
2021-03-02 09:46:05 +01:00 |
|
Florian HENRY
|
d7500b1609
|
fix php warning
|
2021-03-02 09:45:49 +01:00 |
|
Laurent Destailleur
|
0670a00b83
|
Fix phpcs
|
2021-03-02 02:06:09 +01:00 |
|
Laurent Destailleur
|
cffea1889f
|
FIX #16325
|
2021-03-02 01:17:28 +01:00 |
|
Frédéric FRANCE
|
c54a61bb67
|
fix
|
2021-03-01 23:54:03 +01:00 |
|
Frédéric FRANCE
|
f2cdbf6bb2
|
Merge remote-tracking branch 'upstream/develop' into add_rule
|
2021-03-01 21:22:34 +01:00 |
|
Frédéric FRANCE
|
a4e25359e7
|
add missing rule
|
2021-03-01 20:37:16 +01:00 |
|
Laurent Destailleur
|
222012da37
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/class/paymentvarious.class.php
htdocs/compta/bank/various_payment/card.php
htdocs/don/card.php
htdocs/langs/en_US/main.lang
htdocs/public/payment/newpayment.php
test/phpunit/DateLibTzFranceTest.php
|
2021-03-01 15:48:30 +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 |
|
Alexandre SPANGARO
|
0abe576fdc
|
FIX: Various payment - Missing fields for check transmitter & bank name
|
2021-03-01 04:49:06 +01:00 |
|
Alexandre SPANGARO
|
94a861c1c8
|
Code enhanced - Standardize field name
|
2021-03-01 04:07:31 +01:00 |
|
Alexandre SPANGARO
|
706aad3b68
|
Merge remote-tracking branch 'upstream/develop' into 14a15
|
2021-02-28 21:33:59 +01:00 |
|
Alexandre SPANGARO
|
7a3dfda8ee
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-28 21:30:25 +01:00 |
|
Laurent Destailleur
|
886cbc61c8
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/card.php
htdocs/core/boxes/box_factures_fourn.php
htdocs/core/boxes/box_factures_fourn_imp.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/boxes/box_members.php
htdocs/core/boxes/box_propales.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
|
2021-02-28 13:37:45 +01:00 |
|
Laurent Destailleur
|
2ce76133f4
|
FIX #16487
|
2021-02-28 12:59:58 +01:00 |
|
Laurent Destailleur
|
0832c25b5b
|
Look and feel v14
|
2021-02-28 11:48:35 +01:00 |
|
Alexandre SPANGARO
|
ca7958f273
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-28 07:32:23 +01:00 |
|
stickler-ci
|
86c83ff72c
|
Fixing style errors.
|
2021-02-28 06:14:40 +00:00 |
|
Alexandre SPANGARO
|
ad95caac7e
|
Merge branch 'develop' into 14a15
|
2021-02-28 07:12:24 +01:00 |
|
Alexandre SPANGARO
|
6e1d67084d
|
Merge remote-tracking branch 'upstream/develop' into 14a15
|
2021-02-28 07:09:30 +01:00 |
|
Laurent Destailleur
|
9cf4222d3a
|
Look and feel v14
|
2021-02-27 17:15:40 +01:00 |
|
daraelmin
|
739cd0466d
|
Fix Dolibarr#16418 missing title in "iNew cCash Fence"
|
2021-02-26 17:24:39 +01:00 |
|
daraelmin
|
1b6bc8b132
|
Fix #16418 missing in "Tags of transactions"
|
2021-02-26 17:18:09 +01:00 |
|
daraelmin
|
0749585687
|
Fix #16418 title in "Transaction list by category"
|
2021-02-26 17:11:18 +01:00 |
|
daraelmin
|
ea18a47113
|
Fix #16418 missing title in "internal transfer"
|
2021-02-26 17:01:53 +01:00 |
|
Gauthier PC portable 024
|
e598b49545
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-26 15:33:36 +01:00 |
|
Laurent Destailleur
|
93f0754be9
|
Fix removed a bugged section (not used, was in develop mode only)
|
2021-02-26 14:33:27 +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 |
|
Laurent Destailleur
|
ccffa7e2a0
|
Merge pull request #16412 from frederic34/compta_codesyntax
code syntax compta directory
|
2021-02-26 10:21:22 +01:00 |
|
Alexandre SPANGARO
|
e177ac566c
|
Merge remote-tracking branch 'upstream/develop' into 14a15
|
2021-02-25 05:02:03 +01:00 |
|
Laurent Destailleur
|
d4a78bf7c6
|
Removed useless field
|
2021-02-24 10:24:54 +01:00 |
|
Frédéric FRANCE
|
61600a9e65
|
code syntax compta directory
|
2021-02-23 21:09:01 +01:00 |
|
Laurent Destailleur
|
2642e1d1b3
|
Code syntax
|
2021-02-23 15:35:16 +01:00 |
|
Gauthier PC portable 024
|
c0160a5f3b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-23 15:20:15 +01:00 |
|
Laurent Destailleur
|
888c072af0
|
NEW Can set a percentage when creating an invoice from another object
|
2021-02-23 14:48:54 +01:00 |
|
Laurent Destailleur
|
8c1902be1b
|
Missing space
|
2021-02-22 18:40:15 +01:00 |
|
Gauthier PC portable 024
|
10008360e2
|
Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-22 09:29:47 +01:00 |
|
Gauthier PC portable 024
|
bc1d06e5cc
|
FIX : wrong payment salary object on accounting-files.php
|
2021-02-22 09:19:03 +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 |
|
Alexandre SPANGARO
|
d04b04c10f
|
Fix
|
2021-02-22 06:22:47 +01:00 |
|
Alexandre SPANGARO
|
70dddd9bdf
|
Index & module
|
2021-02-22 05:58:46 +01:00 |
|
Laurent Destailleur
|
e3419df36e
|
Merge branch 'develop' into 14a20
|
2021-02-21 20:28:06 +01:00 |
|
Laurent Destailleur
|
1bb27f8f18
|
Responsive
|
2021-02-21 13:12:16 +01:00 |
|
Alexandre SPANGARO
|
3dcfe40e71
|
Code enhanced - Standardize field name #14697
|
2021-02-20 08:00:27 +01:00 |
|
Laurent Destailleur
|
71f537e4c1
|
Responsive
|
2021-02-19 22:12:03 +01:00 |
|
Laurent Destailleur
|
712c2f20df
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2021-02-19 22:06:48 +01:00 |
|
Laurent Destailleur
|
b167a4a0c7
|
FIX date selector when using reduced year (like on smartphone)
|
2021-02-19 22:00:44 +01:00 |
|
Laurent Destailleur
|
0ede8c2b9c
|
Merge pull request #16356 from atm-lena/develop_BankEntries_FIX_SearchUSerThirdparty_Reconstruct
Develop bank entries fix search user thirdparty reconstruct
|
2021-02-19 17:48:37 +01:00 |
|
Laurent Destailleur
|
0dabbcd7f5
|
Update bankentries_list.php
|
2021-02-19 17:48:15 +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 |
|
Laurent Destailleur
|
3ff80ac1f8
|
FIX #16304
|
2021-02-19 14:15:58 +01:00 |
|
Laurent Destailleur
|
b6211a7990
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-19 14:12:00 +01:00 |
|
Laurent Destailleur
|
3285dd3199
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
ChangeLog
htdocs/compta/bank/various_payment/list.php
|
2021-02-19 14:11:08 +01:00 |
|
Laurent Destailleur
|
dc3377f0f0
|
Merge pull request #16348 from ptibogxiv/patch-416
Fix multientity in cash fence report
|
2021-02-19 13:51:44 +01:00 |
|
Laurent Destailleur
|
556651a3ae
|
Update report.php
|
2021-02-19 13:51:15 +01:00 |
|
Laurent Destailleur
|
5340c30db3
|
FIX missing security test on payment page
FIX sql error on group by on payment list
|
2021-02-19 12:35:26 +01:00 |
|