lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
105,187 Commits 43 Branches 150 Tags 886 MiB
revert-19608-patch-2
Commit Graph

707 Commits

Author SHA1 Message Date
Alexandre SPANGARO
8bde61c2c6 FIX Accountancy - Link from admin 2021-07-05 06:58:10 +02:00
Florian HENRY
87276fadf8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta 2021-06-10 16:10:11 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Florian HENRY
2fdc6d9461 NEW : rewrite bind accountancy code finding on customer invoice 2021-06-04 11:35:12 +02:00
Florian Mortgat
e6deab5c85 FIX proposed new feature: autocomplete for accounting account groups 2021-05-28 08:42:38 +02:00
Florian Mortgat
c29d5fa747 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_autocomplete_accounting_account_groups 2021-05-28 08:19:55 +02:00
Laurent Destailleur
d18fc6ca3c Fix init 2021-05-25 15:38:12 +02:00
Florian Mortgat
8eb8889b17 NEW: autocomplete account group when editing an account card 2021-05-19 11:12:34 +02:00
Laurent Destailleur
a806a18455 Reduce sql 2021-05-03 13:35:10 +02:00
Laurent Destailleur
d7e445efbd Better doc 2021-05-03 12:01:26 +02:00
Alexandre SPANGARO
d95be3e08b Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-26 13:53:16 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Laurent Destailleur
ea97992c3d css 2021-04-19 22:52:13 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +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
Laurent Destailleur
3439bc4a0f Clean code 2021-04-13 11:30:23 +02:00
Laurent Destailleur
9e491ad30c Add comment 2021-04-13 10:18:23 +02:00
Laurent Destailleur
7004747ca3 Add more tooltips on edition of accounting account 
Fix setup of accountancy

Conflicts:
	htdocs/accountancy/admin/account.php
 2021-04-13 09:51:17 +02:00
Laurent Destailleur
243fcb38ba Add more tooltips on edition of accounting account 
Fix setup of accountancy
 2021-04-13 09:46:50 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
2816677d94 Fix css 2021-04-07 01:09:23 +02:00
Laurent Destailleur
baf3cbdd6f
Merge pull request #17096 from Hystepik/develo#2 
Close #17073 : Add of select line for mass deletion of chart of account lines
 2021-04-06 19:46:46 +02:00
Laurent Destailleur
ab2231c9cf
Update account.php 2021-04-06 19:44:31 +02:00
lmarcouiller
3f70904398 changes to match eldy advices 2021-04-06 09:42:05 +02:00
Laurent Destailleur
95de241245 FIx #yogosha5774 2021-04-05 15:21:17 +02:00
Laurent Destailleur
01eec2b919 FIx #yogosha5774 2021-04-05 15:11:28 +02:00
Laurent Destailleur
5769701cd0 Better example 2021-04-05 15:05:21 +02:00
lmarcouiller
369994fa92 Fix #17073 : Add of select line and mass delete 2021-04-03 10:12:05 +02:00
Laurent Destailleur
bb8ec90b79 Fix css 2021-04-02 02:50:07 +02:00
Laurent Destailleur
2af8b7078c Fix turnover calculation was wrong. We must include only 2021-03-31 19:50:43 +02:00
Alexandre SPANGARO
5723dbb836 FIX: Add a sub table to manage accountancy on product/company 2021-03-31 04:52:24 +02:00
Alexandre SPANGARO
38d47c184e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 22:12:57 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +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
843e0a2c39 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/html.formother.class.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
	htdocs/projet/tasks/time.php
	htdocs/webservices/server_thirdparty.php
 2021-03-29 21:47:31 +02:00
Alexandre SPANGARO
3c70a3d06c Move to _PERENTITY 2021-03-27 07:25:31 +01:00
Alexandre SPANGARO
1382323f77 FIX Start hour on ACCOUNTING_DATE_START_BINDING 2021-03-27 06:56:34 +01: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
Laurent Destailleur
992e2e0825 Show None if no account found. 2021-03-26 12:27:23 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +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
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
Philippe GRAND
1ca6068a41 fix : deprecated 2020-10-22 16:34:12 +02:00
Florian HENRY
0fee06139a Merge github.com:Dolibarr/dolibarr into develop 2020-10-10 10:23:17 +02:00
Florian HENRY
705b029608 fix return on filtered page when modify accountancy code 2020-10-10 10:22:58 +02:00
Laurent Destailleur
967e7997e6 Trans and clean code 2020-10-09 19:34:57 +02:00
Laurent Destailleur
327ca5f595 css 2020-10-09 18:18:18 +02:00
Laurent Destailleur
4188a21c6b css 2020-10-09 17:59:22 +02:00