Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
118,434 Commits 36 Branches 189 Tags
e0da8a2109d6b10366ccb4610394d2bc61e4213f
Commit Graph

813 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
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
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
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
Frédéric FRANCE
337689d5d2 code syntax 2021-02-22 21:36:42 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +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
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00
Laurent Destailleur
0f7bdef1c1 FIX in pages of balances 2021-01-21 18:02:17 +01:00
Laurent Destailleur
e7a77525ca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:02:42 +01:00
Laurent Destailleur
1fe6eccb1c css 2021-01-17 11:46:41 +01:00
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
 2021-01-09 02:34:43 +01:00
Alexandre SPANGARO
5606542220 FIX: Accountancy - Add control on required fields when we create an account 2021-01-07 06:59:40 +01:00
Frédéric FRANCE
9916335d93 remove whitespace 2020-12-30 19:17:28 +01:00
Laurent Destailleur
92a88441ac Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping 
Dev multifilter jounal on bookeping
 2020-12-30 13:19:27 +01:00
Laurent Destailleur
e5da047134 Update index.php 2020-12-30 13:16:38 +01:00
Laurent Destailleur
057ed201a7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2020-12-30 12:08: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
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Alexandre SPANGARO
7adcde3e42 FIX: Search of type on subaccount 2020-11-08 03:51:35 +01:00
Florian HENRY
c9373e318e fix admin 2020-11-07 15:33:23 +01:00
Florian HENRY
1bdd617feb NEW: Multiselect ledger account code filter on book keeping list 2020-11-07 15:31:27 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
 2020-11-01 17:58:41 +01:00
Laurent Destailleur
63a03cdad6 FIX #15208 2020-11-01 14:34:29 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Philippe GRAND
3854808d21 fix : deprecated 2020-10-22 16:39:21 +02:00
Philippe GRAND
9dc93b0e29 fix : deprecated 2020-10-22 16:38:43 +02:00
Philippe GRAND
9260eed12a fix : deprecated 2020-10-22 16:37:06 +02:00
Philippe GRAND
1319765a4f fix : deprecated 2020-10-22 16:35:47 +02:00