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

911 Commits

Author SHA1 Message Date
Laurent Destailleur
ca04ffe420 Load lang 2018-06-22 17:07:49 +02:00
Laurent Destailleur
31067b6250 FIX picto for type in product link in accountany list is wrong 2018-06-18 14:43:32 +02:00
Laurent Destailleur
ce5514bd68 Fix sql begin at wrong place 2018-06-18 14:37:16 +02:00
Laurent Destailleur
102f9aa84f FIX Problems in accountancy module when using multicompany module. 2018-06-18 13:19:46 +02:00
Sean Wang
8e397b772f Fix sql error 2018-05-21 14:19:41 +08:00
Laurent Destailleur
078ea2ce9b
Merge pull request #8790 from aspangaro/7.0-f1 
Fix : Double WHERE on admin/journal_list.php
 2018-05-18 11:20:05 +02:00
Laurent Destailleur
26e10caa7d FIX #8813 2018-05-18 09:15:18 +02:00
Alexandre SPANGARO
88bc2dd416 Correct insert 2018-05-14 20:59:38 +02:00
Alexandre SPANGARO
2f1ac6fad8 Fix : Double WHERE on admin/journal_list.php 2018-05-13 20:35:07 +02:00
Laurent Destailleur
9c68b81f59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/projet/class/task.class.php
 2018-05-05 14:34:54 +02:00
florian HENRY
886ad9d4b6 check eldy message 2018-05-02 08:45:18 +02:00
florian HENRY
b5d7206519 fix 6.0 accountancy multientity 2018-05-01 12:02:33 +02:00
Laurent Destailleur
83b762b681 FIX CVE-2018-9019 2018-04-25 16:01:06 +02:00
Laurent Destailleur
50d86a7cfd Fix accounting area when advanced accounting module not enabled 2018-04-16 14:25:39 +02:00
Laurent Destailleur
afdd504e16 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/journal/sellsjournal.php
 2018-04-11 17:58:21 +02:00
atm-ph
6f526eb780 Fix wrong amount for situation invoice in sellsjournal 2018-04-11 16:40:59 +02:00
Laurent Destailleur
3d36e3ee49 Fix search criteria in bookkeeping table 2018-04-08 12:41:03 +02:00
Laurent Destailleur
8cca3dabd6 FIX look and feel v7 "back to" for bookkeeping record 2018-04-08 11:29:30 +02:00
Laurent Destailleur
aad99bdcc0 FIX Removed error when no error on accounting setup page 2018-04-07 22:27:42 +02:00
Laurent Destailleur
930512d9a2 FIX Add a test to avoid to reset binding by error. 2018-03-27 13:08:16 +02:00
Laurent Destailleur
56944115cb Hide a very dangerous feature. Should be useless. 2018-03-27 12:46:15 +02:00
Laurent Destailleur
dab8dbd671 FIX Binding pages must start on fiscal month not calendar month 2018-03-27 12:31:08 +02:00
Laurent Destailleur
88939a8469 FIX Draft invoice must be excluded from report 2018-03-27 11:10:12 +02:00
Laurent Destailleur
89bf781fe6 FIX Add warning when expense report line not into range 
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
 2018-03-26 14:13:40 +02:00
Laurent Destailleur
891ebc0e7c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-21 10:59:59 +01:00
Laurent Destailleur
04199c2b4b Fix according to mail of Olivier Geffroy the 21th of march 2018-03-21 10:59:13 +01:00
Laurent Destailleur
8e50e63243 Fix translation 2018-03-18 20:32:18 +01:00
Laurent Destailleur
542eb2e5f4 Comment 2018-03-15 13:19:29 +01:00
Laurent Destailleur
85e307d6b8 Fix report when group is not dedicated to a country 2018-03-15 12:31:24 +01:00
Laurent Destailleur
73005d81a7 FIX country must not be mandatory for accounting report groups 2018-03-15 11:42:59 +01:00
Laurent Destailleur
4957ea9178 Fix SQLi reported by op7ica 2018-03-15 01:55:16 +01:00
Sean Wang
9a1588df13 Add missing $mode in BookKeeping::createStd() 
In accountancy ledger, creating new transaction, there is
'ERROR: 55000: currval of sequence "llx_accounting_bookkeeping_rowid_seq"
is not yet defined in this session' occurred.

According to dolibarr.log, this error will show up after
createStd() {...Insert request to llx_accounting_bookkeeping_tmp...}.

It query the "llx_accounting_bookkeeping_rowid_seq" instead of
"llx_accounting_bookkeeping_tmp_rowid_seq",
due to missing $mode at bookkeeping.class.php
line504:last_insert_id().
 2018-03-14 16:38:22 +08:00
Laurent Destailleur
2053cc9307
Merge pull request #8284 from hregis/7.0_bug5 
Fix: wrong entity id, always value 1 !
 2018-03-07 12:19:09 +01:00
Laurent Destailleur
0dfc9af72a FIX multicompany compatibility and fix reports 2018-03-06 19:58:13 +01:00
Regis Houssin
1807bb36e2 Fix: missing global $conf 2018-03-06 13:31:13 +01:00
Regis Houssin
35703cff99 Fix: wrong entity id, already value 1 ! 2018-03-06 13:23:00 +01:00
Laurent Destailleur
ee4fcba4f2 Fix class not found 2018-02-27 22:11:11 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
florian HENRY
b4b185abe0 fix bad link invoice URL into acoutantcy customer affectation 2018-02-23 14:42:52 +01:00
Laurent Destailleur
48d250b201 Help to understand 2018-02-20 15:55:58 +01:00
Laurent Destailleur
aa1ede6f74 FIX Search criteria on vat 2018-02-20 06:03:08 +01:00
Laurent Destailleur
12e48e07ae Fix deletion of ledger line when editing transaction 2018-02-12 13:50:26 +01:00
Laurent Destailleur
284e6f1ad3 Better position of error check 2018-02-12 13:39:06 +01:00
Laurent Destailleur
caa136bed3 FIX Debug journalization: Avoid journalizing if all lines not bound 2018-02-12 13:31:32 +01:00
Laurent Destailleur
09dfd5eb9f Fix journalization protection 2018-02-12 12:02:01 +01:00
Laurent Destailleur
f251113f69 Fix accounting module with multicompany 2018-02-06 01:00:35 +01:00
Laurent Destailleur
c2590b9c7e Fix: complete labels of operation if bank journal 
Conflicts:
	htdocs/compta/tva/class/tva.class.php
 2018-02-05 17:10:18 +01:00
Laurent Destailleur
a91172b7bc Add comment into csv export 2018-02-03 18:58:02 +01:00
Laurent Destailleur
fe1f276d85 FIX labels into ledger are same that into screen 
FIX pagination
FIX init of fiscal year
Fix tr balance
 2018-02-02 17:24:40 +01:00
Laurent Destailleur
a41847d084 Fix: date of modificaiton in ledger not visible. 
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
 2018-02-02 14:27:07 +01:00