lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96,759 Commits 43 Branches 150 Tags 886 MiB
5af4b4673c
Commit Graph

2221 Commits

Author SHA1 Message Date
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
976b61456a
Merge pull request #16824 from dolibit-ut/patch-117 
Update fiscalyear_info.php
 2021-03-20 11:57:34 +01:00
Laurent Destailleur
139cd5e8b7
Merge pull request #16823 from dolibit-ut/patch-116 
Update fiscalyear_card.php
 2021-03-20 11:57:24 +01:00
Laurent Destailleur
1230c99629
Merge pull request #16822 from dolibit-ut/patch-115 
Update fiscalyear.php
 2021-03-20 11:53:01 +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
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
UT from dolibit
a0feed2517
Update fiscalyear_info.php 
$help_url = "EN:Module_Double_Entry_Accounting";

llxHeader('', $title, $help_url);
 2021-03-19 09:08:55 +01:00
UT from dolibit
19f7b10e4f
Update fiscalyear_card.php 
$help_url = "EN:Module_Double_Entry_Accounting";

llxHeader('', $title, $help_url);
 2021-03-19 09:07:27 +01:00
UT from dolibit
6713d9b099
Update fiscalyear.php 
$help_url = "EN:Module_Double_Entry_Accounting";

llxHeader('', $title, $help_url);
 2021-03-19 09:05:49 +01:00
Laurent Destailleur
9a5d1acc1d
Merge pull request #16769 from frederic34/patch-4 
fix php8 warning
 2021-03-18 23:20:43 +01:00
Laurent Destailleur
99f95741d1
Merge pull request #16781 from frederic34/patch-12 
fix php8 warning
 2021-03-18 23:09:22 +01:00
UT from dolibit
569d33392d
Update card.php 
change  $helpurl  -> $help_url

$help_url = 'EN:Category:Accounting';
 2021-03-18 21:49:29 +01:00
Alexandre SPANGARO
18d247026d NEW: Add a sub table to manage product/societe 2021-03-18 17:08:55 +01:00
Laurent Destailleur
46972ec669 FIx #5660 2021-03-18 14:34:44 +01:00
Frédéric FRANCE
f9e1624a78
fix php8 warning 2021-03-17 22:41:18 +01:00
Frédéric FRANCE
340f67fce8
fix php8 warning 2021-03-17 18:23:44 +01:00
Frédéric FRANCE
7b8d1abfcf
fix php8 warnings 2021-03-16 18:04:51 +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
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Laurent Destailleur
765fdff871
Merge pull request #16689 from dolibit-ut/patch-74 
Update thirdparty_lettering_supplier.php
 2021-03-15 17:17:21 +01:00
UT from dolibit
4923bb3577
Update thirdparty_lettering_supplier.php 
-> $help_url add 'DE:Modul_Geschäftspartner'
 2021-03-15 15:40:58 +01:00
UT from dolibit
15f9d07d57
Update thirdparty_lettering_customer.php 
-> $help_url    add   'DE:Modul_Geschäftspartner'
 2021-03-15 15:36:08 +01:00
Frédéric FRANCE
11afb74bae
fix php8 warning 2021-03-14 18:04:51 +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
Laurent Destailleur
6a5d3bdec2
Merge pull request #16602 from fmarcet/13.0 
FIX: Buttons to disable bindings not working
 2021-03-11 16:05:12 +01:00
Laurent Destailleur
9ed128c6fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/card.php
 2021-03-10 15:35:09 +01:00
Laurent Destailleur
a0c7c6bad9 Fix selection of accounting account 2021-03-10 10:45:01 +01:00
Ferran Marcet
1dae21e608 FIX: Buttons to disable bindings not working 2021-03-09 18:44:06 +01:00
Laurent Destailleur
c0e0300eb3 Enhance the page security 2021-03-08 11:08:58 +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
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
Frédéric FRANCE
1b046f25cf
add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
Laurent Destailleur
c1a75d7b70 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 19:39:17 +01:00
Laurent Destailleur
e7da1d7fe4 FIX #16431 2021-02-26 19:38:18 +01:00
Laurent Destailleur
dd72a52e8f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balancebymonth.php
	htdocs/accountancy/class/accountancyexport.class.php
 2021-02-26 19:23:23 +01:00
Laurent Destailleur
d5566dbf8f FIX #16431 2021-02-26 19:18:03 +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
Gauthier PC portable 024
4f767c0823 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a FIX : correction of payment salaries list on employee tab of user card 2021-02-23 15:08:27 +01:00
Frédéric FRANCE
337689d5d2
code syntax 2021-02-22 21:36:42 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
7fd2ac6618 Fix link to show line in pending account 2021-02-22 16:20:13 +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
be3703a05b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-02-15 16:46:55 +01:00
Laurent Destailleur
f0e234c874 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/bank/various_payment/list.php
 2021-02-15 16:45:17 +01:00
Alexandre SPANGARO
83f9451b43 FIX: Accountancy - Fix some problems on CEGID export 2021-02-11 13:17:20 +01:00