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

177 Commits

Author SHA1 Message Date
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
31ad147e0e Look and feel v11 2019-10-23 15:17:01 +02:00
Laurent Destailleur
02f559db5f Use GETPOST 2019-10-23 15:07:21 +02:00
Laurent Destailleur
564f96c092 Fix scrutinizer warnings 2019-10-23 14:59:02 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
8cf0671804 FIX Missing transaction 2019-08-18 18:56:21 +02:00
Laurent Destailleur
42fda54edf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/fichinter/list.php
	htdocs/product/stock/replenish.php
 2019-04-02 19:41:58 +02:00
Laurent Destailleur
c5348be337 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-02 19:35:42 +02:00
Laurent Destailleur
17a61b3232 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-02 19:34:49 +02:00
Laurent Destailleur
143cbba09b
Update card.php 2019-03-31 18:49:38 +02:00
Alexandre SPANGARO
5588fe5b81 FIX: Don't show journal:getNomUrl without data 
ErrorBadValueForParamNotAString
 2019-03-30 09:42:13 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
58bda12e22 css 2019-01-17 19:31:01 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
TuxGasy
db223af39b Add somes hooks in bank planned entries 2018-09-22 18:44:00 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Laurent Destailleur
6291f18179
Merge pull request #9440 from frederic34/patch-5 
Upper Lower Casing
 2018-09-12 18:24:02 +02:00
Frédéric FRANCE
b2a58067d9
replace select_date 2018-09-09 09:56:33 +02:00
Frédéric FRANCE
ee8d56e047
Update card.php 2018-09-08 23:18:38 +02:00
Juanjo Menent
b8efe3b239
Merge pull request #9172 from grandoc/new_branch_28_07_2018 
standardize
 2018-08-02 11:27:02 +02:00
Philippe GRAND
fb565b15c5 standardize 2018-07-29 19:16:28 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Frédéric FRANCE
84f2b31d46
loadlangs 2018-05-27 09:40:17 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
 2018-04-12 13:31:14 +02:00
Laurent Destailleur
590bc2948a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
 2018-04-11 17:20:49 +02:00
Laurent Destailleur
628b437e28
Update card.php 2018-04-11 16:25:05 +02:00
Laurent Destailleur
9af052602a Fix css 2018-04-11 12:54:57 +02:00
atm-arnaud
848d76ee78 FIX #8023 2018-04-10 14:43:32 +02:00
Laurent Destailleur
54a86dc2b1 Fix CSS 2018-04-09 11:42:43 +02:00
Laurent Destailleur
9314dcb046 Fix regression 2017-12-12 10:13:48 +01:00
Laurent Destailleur
1b3680c200 Fix missing css 2017-12-03 12:21:38 +01:00
Laurent Destailleur
f33182acc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-12 20:49:53 +01:00
Laurent Destailleur
50ed463b9f
Merge pull request #7784 from frederic34/patch-3 
account number on create bank account
 2017-11-11 17:37:29 +01:00
Frédéric FRANCE
1ea6df14d0
Update card.php 2017-11-08 11:35:15 +01:00
Frédéric FRANCE
27ace14fb7
Fetch right account 2017-11-07 16:28:51 +01:00
Laurent Destailleur
9cc923f317 Fix for ch accounting account. 2017-11-06 21:12:29 +01:00
Laurent Destailleur
07d16afe3b Save one space 2017-10-13 23:10:40 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
06b18a740e NEW Add date of birth on user card. 
NEW Show expected worked hours on the timesheet form.
 2017-10-06 12:08:01 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Laurent Destailleur
291a0d46e6 Fix edit of categories 2017-09-18 01:39:39 +02:00
Laurent Destailleur
502ac19a0a Fix regression on categories 2017-08-27 12:28:59 +02:00
Laurent Destailleur
3f7eea2e0a NEW Can set language on extrafields 2017-08-27 12:12:02 +02:00
Laurent Destailleur
f39fb5187a Fix component to select journal 2017-06-15 20:27:40 +02:00
Laurent Destailleur
e93cefbbf0 FIX #6985 2017-06-11 10:37:58 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Alexandre SPANGARO
1f079fac9d Move html.formventilation.class.php to html.formaccounting.class.php 2017-05-25 06:57:28 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal 
Fix : Sql error on salaries index for accountancy multijournal + debug
 2017-05-18 17:45:21 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
143c019905 Fix : Sql error on salaries index for accountancy multijournal + debug 2017-05-14 08:07:34 +02:00
Alexandre SPANGARO
7c4b47f20d Update works 2017-05-06 08:33:12 +02:00
Alexandre SPANGARO
68aaef2f66 Add list to select journal in bank 2017-05-06 08:06:01 +02:00
Alexandre SPANGARO
fa4bb4e80a Remove accounting.lib.php 2017-05-01 21:12:52 +02:00
Alexandre SPANGARO
e1e2481e37 Remove picto 2017-05-01 21:09:09 +02:00
Alexandre SPANGARO
102deccba7 Use getnomUrl on bank accountancy number 2017-05-01 21:06:31 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
florian HENRY
196156a21e fix setEventMessages error insteads of errors 2017-04-13 16:35:29 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
Laurent Destailleur
0d07ad8c69 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/compta/bank/class/account.class.php
 2017-02-27 11:58:35 +01:00
Laurent Destailleur
10838983b5 FIX error management in bank account deletion. 2017-02-27 11:38:19 +01:00
Laurent Destailleur
024cecec29 FIX Error management during bank account creation 2017-02-27 11:16:46 +01:00
Laurent Destailleur
fc401a9c68 Fix more security fixes 2016-12-18 17:27:06 +01:00
Laurent Destailleur
663f7938f8 Fxi responsive design 2016-11-27 20:02:57 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
97d84ab4ab Better responsive design 2016-11-11 23:47:56 +01:00
Laurent Destailleur
35601775e0 By default we open a new tab on external url link 2016-10-22 17:05:47 +02:00
Laurent Destailleur
f93bca9be9 NEW Can see/make bank conciliation from transaction list 2016-10-21 17:00:31 +02:00
Laurent Destailleur
4cf4090cde Css 2016-10-17 00:21:39 +02:00
Laurent Destailleur
e79a84a89b Uniformize code 2016-10-05 21:49:04 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
aspangaro
358bcee3a5 Presentation on financiel account 2016-08-29 21:49:34 +02:00
aspangaro
b7420372b7 Uniformize presentation, add button cancel everywhere 2016-08-12 22:53:30 +02:00
Laurent Destailleur
621a29d0e0 Fix account may contains text 2016-07-18 12:01:25 +02:00
aspangaro
e6da7c5574 Fix: Accountancy - Problem with empty accountancy acccount in create / modify mode 2016-07-17 07:09:17 +02:00
Laurent Destailleur
5222b78e95 FIX property of bank account were lost if an error occured during 
saving.
 2016-06-25 14:20:23 +02:00
frederic34
17463b4927 categories account like other categories 2016-04-30 14:45:24 +02:00
aspangaro
2a7c7a0748 Same problem on bank 2016-04-23 08:09:38 +02:00
Marcos García de La Fuente
a41a80b8fe Merge branch 'develop' into oop-refactor-bankaccount-tostring 2016-04-09 23:17:09 +02:00
Laurent Destailleur
104e34fe22 Fix css and missing link "go to list" 2016-04-08 03:40:23 +02:00
Laurent Destailleur
f61f1c7a27 Merge pull request #4857 from marcosgdf/bankacc-misc 
Little refactor
 2016-03-25 17:43:56 +01:00
Marcos García de La Fuente
889c72611d NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown 2016-03-19 23:00:33 +01:00
Marcos García de La Fuente
59bfac65aa Little refactor 2016-03-19 20:48:37 +01:00
Marcos García de La Fuente
1be9c53b6c NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country 2016-03-19 19:39:18 +01:00
Laurent Destailleur
79989c2f65 Merge pull request #4741 from marcosgdf/account-oop-properties 
Fixed wrong Account class property used in bank/card.php
 2016-03-10 13:53:17 +01:00
Laurent Destailleur
4fa84c8d8f Merge pull request #4707 from marcosgdf/misc2 
Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated
 2016-03-10 13:21:51 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
 2016-03-08 17:40:21 +01:00
Marcos García de La Fuente
66f71d16d9 Fixed wrong Account class property used in bank/card.php 2016-03-06 19:59:37 +01:00
Laurent Destailleur
3dbe27030e FIX If all banks account are reconcilable to off, we must not show nb of 
transactions to reconciles.
FIX Switching status reconcile on-off was broken.
 2016-03-06 12:39:59 +01:00
Laurent Destailleur
cbd102fa45 Merge and rename method into camel format 2016-03-04 16:28:38 +01:00
Marcos García de La Fuente
dcde7773a3 Started using Account TYPE and STATUS constants 2016-03-02 11:04:52 +01:00