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

579 Commits

Author SHA1 Message Date
Alexandre SPANGARO
503f190fd4 Fix 2020-10-06 14:39:10 +02:00
Alexandre SPANGARO
050a4770d3 WIP NEW Add clone functionality on miscellaneous payment 2020-10-06 10:04:15 +02:00
Laurent Destailleur
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
cc24e9b155 Look and feel v13 2020-09-15 13:27:48 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
5c776ccf3f
Merge pull request #14708 from TobiasSekan/AddGlobalMiscPaymentSearch 
NEW Add global search for miscellaneous payments
 2020-09-12 01:13:26 +02:00
Laurent Destailleur
c4383747a1 Look and feel v13 2020-09-11 13:57:16 +02:00
Sekan, Tobias
25d6af2b86 Add global search for misc payments +TODO 2020-09-11 09:55:34 +02:00
Laurent Destailleur
358f8357f9 FIX #14703 2020-09-10 18:25:38 +02:00
Laurent Destailleur
8b4e153f81 Doc 2020-08-05 20:05:59 +02:00
Laurent Destailleur
90d4458aab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-06-27 00:38:51 +02:00
Laurent Destailleur
02e022ebfa Fix class not found for supplier credit. Class must be into 
commoninvoice
 2020-06-24 19:59:06 +02:00
Laurent Destailleur
ff9312c96a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/class/ligneprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/line.php
 2020-06-08 20:36:54 +02:00
Laurent Destailleur
c386f4b2e3 Maxi debug of direct debit order 2020-06-08 11:43:20 +02:00
Laurent Destailleur
7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/user/card.php
 2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:00:24 +02:00
Florian Mortgat
c393f8149c FIX: when creating a VariousPayment, the value date is not copied onto the AccountLine that gets created at the same time, so the bank transaction's value date will be the payment date instead of the payment's value date 2020-06-04 11:29:51 +02:00
Laurent Destailleur
f66555b396 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 23:38:46 +02:00
Laurent Destailleur
6881610892 Doxygen 2020-05-27 23:23:01 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec
add new rule 2020-05-21 01:52:25 +02:00
Laurent Destailleur
b5f3be4599 Clean phpcs rule file 2020-05-13 00:29:46 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Frédéric FRANCE
4605b9ec61
Update api_bankaccounts.class.php 2020-04-22 19:16:58 +02:00
Frédéric FRANCE
61e76ef25e
Update api_bankaccounts.class.php 2020-04-19 21:47:30 +02:00
Laurent Destailleur
ee26390f89 Look and feel v12 2020-04-17 19:15:22 +02:00
ptibogxiv
284f269213
Update api_bankaccounts.class.php 2020-04-15 19:32:45 +02:00
Scrutinizer Auto-Fixer
387ea73bf3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-13 11:24:42 +00:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
Laurent Destailleur
2e27355dec FIX #13569 2020-04-12 16:51:35 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
f5a07dfb7e Add status into popup 2020-02-28 18:57:17 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
4f3cc87077 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:00 +01:00
Laurent Destailleur
f3e27695e2 FIX Avoid deletion of bank record if in accounting 2020-02-05 16:35:50 +01:00
Laurent Destailleur
44ed5980f5 FIX Avoid deletion of bank record if in accounting 2020-02-05 16:35:09 +01:00
Michael Jeanmotte
f1f83656f1 Feature Request: Dolibarr API - [GET] /bankaccounts/{id}/lines : add sqlfilters #11259 2020-01-29 22:54:35 +01:00
Laurent Destailleur
9ebdd82edb Fix We must refuse to delete a various payment if payment was dispatched 
in accountancy.
 2020-01-10 02:43:24 +01:00
Laurent Destailleur
675ce3b32f Fix sql error on update of subledger account on a various payment 
Fix warning message that was not accurate
 2020-01-10 02:20:08 +01:00
Laurent Destailleur
9685b56375 Fix warning 2019-12-15 15:03:22 +01:00
Frédéric FRANCE
269e53583d
doxygen 2019-12-11 23:46:12 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Laurent Destailleur
2ccef4e469 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2019-11-11 19:10:35 +01:00
Laurent Destailleur
5a4a421a8e FIX #12372 2019-11-07 13:07:40 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory 2019-10-26 18:13:20 +02:00
Laurent Destailleur
b4eb14ee44 Use dolGetStatus 2019-10-24 16:43:23 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
6abfd8b145 Fix use short labels for workboard 2019-08-19 10:01:42 +02:00
Laurent Destailleur
f27bea9497 Fix phpcs 2019-08-18 20:39:02 +02:00
Laurent Destailleur
ad5f2dbe9d Fix update on id 2019-08-18 18:56:58 +02:00
Jean Traullé
6edf5494c3
Added @throws annotations for possible exceptions 2019-08-15 15:29:37 +02:00
Jean Traullé
f37b8c78c8
NEW Add POST /bankaccounts/transfer REST API endpoint. 
This allow internal transfers between two bankaccounts.
 2019-08-15 15:18:09 +02:00
Alexandre SPANGARO
5f042cf6ad QUAL Move ligne.php to line.php 2019-07-19 23:19:06 +02:00
Laurent Destailleur
280a034199 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-29 13:15:57 +02:00
Laurent Destailleur
cafb3840b7 Fix look and feel v10 2019-05-29 12:56:11 +02:00
Alexandre SPANGARO
19b275f2d1 Fix bankline cat with various payment 2019-05-26 22:33:35 +02:00
Alexandre SPANGARO
ea13657617 Merge remote-tracking branch 'upstream/develop' into 10.0_accountancy2 2019-05-26 14:23:47 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Alexandre SPANGARO
9210a39f6a Merge branch 'develop' into 10.0_accountancy2 2019-04-24 21:49:41 +02:00
Laurent Destailleur
ee4150665e Fix phpcs 2019-03-21 20:15:19 +01:00
Philippe GRAND
86c3b1a5b0 add some comments 2019-03-21 14:59:21 +01:00
Alexandre SPANGARO
ad485b55b6 NEW: Add category to bank transaction in various payment 2019-03-10 20:01:39 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Frédéric FRANCE
62501b11e8
add visibility 2019-03-02 00:14:22 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Alexandre SPANGARO
2ba8ae00e4 Merge remote-tracking branch 'upstream/develop' into develop 2019-02-06 21:56:01 +01:00
Alexandre SPANGARO
13cf3b1d7f Add subledger in various payment 2019-02-01 15:50:12 +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
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +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
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats 2018-12-15 15:17:15 +01:00
Laurent Destailleur
21b3bbc2e6 Merge 2018-12-08 11:55:27 +01:00
Laurent Destailleur
a915d82883 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-08 11:42:30 +01:00
Laurent Destailleur
5ce26bae1b Fix form of bank info for CH 2018-12-04 22:01:35 +01:00
Alexandre SPANGARO
088c002ed1 NEW: Add stats on entries & movements by fiscal year 2018-12-02 11:01:11 +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
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
f8316abfc0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/theme/md/style.css.php
 2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/theme/md/style.css.php
 2018-10-24 02:40:57 +02:00
Laurent Destailleur
99fde00902
Merge pull request #9719 from frederic34/patch-11 
do not trim int
 2018-10-12 17:35:04 +02:00
Laurent Destailleur
cb29209457 NEW Enhancement in process to make manual bank conciliation 2018-10-10 12:47:18 +02:00
Frédéric FRANCE
03fcc2f088
Update paymentvarious.class.php 2018-10-09 20:31:14 +02:00
Frédéric FRANCE
b917fd0cf2
do not trim int 2018-10-09 19:41:53 +02:00
Philippe GRAND
e9bd1be41b Standardize and update code 2018-10-09 15:38:42 +02:00
Laurent Destailleur
5034264d60 Debug / Standardize code 2018-10-04 18:27:49 +02:00
Philippe GRAND
15ff9f8917 Standardize and update code 2018-09-28 14:44:47 +02:00
Philippe GRAND
803505b6b7 Standardize and update code 2018-09-20 12:27:06 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 20:21:35 +02:00
Frédéric FRANCE
cdc5a174aa
Update account.class.php 2018-09-11 00:29:01 +02:00
Frédéric FRANCE
7e0b1055db
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Laurent Destailleur
84bbe8684b Fix scrutinizer 2018-09-08 18:38:24 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Philippe GRAND
38ca6096b2 Standardize and update code 2018-09-05 10:31:12 +02:00
Frédéric FRANCE
7799774ca1
move phpcs:ignore 2018-09-04 22:52:55 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore 2018-09-02 13:38:11 +02:00
Philippe GRAND
c4f05aff28 Standardize and update code 2018-09-02 10:42:31 +02:00
Philippe GRAND
ae2df6be11 Standardize and Update code 2018-09-01 23:04:46 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
7354e485b0 precise label comment 2018-09-01 13:22:08 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018 
New branch 29 08 2018
 2018-09-01 12:11:01 +02:00
Philippe GRAND
edaa575435 Standardize and update code 2018-08-31 18:36:15 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Philippe GRAND
88ad651743 Fix white spaces 2018-08-29 12:26:47 +02:00
Philippe Grand
1337d85a29
Update bankcateg.class.php 2018-08-28 10:40:41 +02:00
Philippe GRAND
65af8f902f Update and standardize code 2018-08-28 09:44:54 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Philippe GRAND
2fa82edd39 Standardize and update code 2018-08-23 17:07:27 +02:00
Philippe GRAND
504b0e3d16 Update and standardize code 2018-08-22 18:34:50 +02:00
Philippe GRAND
6542dcf0bd Update and standardize code 2018-08-22 12:04:50 +02:00
Philippe GRAND
e0462b975b Update and standardize code 2018-08-22 11:48:26 +02:00
Philippe GRAND
95349365ba Update and standardize code 2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Philippe GRAND
29f15b4ae6 Update and standardize code 2018-08-22 10:51:55 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Frédéric FRANCE
69a7af88e7
function declaration 2018-08-15 18:14:02 +02:00
Frédéric FRANCE
d25fa61998
return comment 2018-08-14 13:14:55 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
c991a4d204
trim trailing 2018-07-26 18:05:20 +02:00
Laurent Destailleur
34c2facff1 Fix missing link on bank account 2018-07-17 18:16:30 +02:00
Inovea Conseil
30cff2bb36 ADD check user's rights 2018-07-05 11:52:41 +02:00
Laurent Destailleur
2fc2c44de4 Fix phpcs 2018-04-29 20:18:50 +02:00
Laurent Destailleur
e72c2e6a11 Enhance sorting of field for lists on field with several sort criterias 2018-04-28 19:54:41 +02:00
Laurent Destailleur
d1e9a4719b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
 2018-03-27 12:27:15 +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
5a397fff72 Fix scrutinizer bugs 2018-03-16 00:16:32 +01:00
florian HENRY
8e84b733dc fix scrutinizer 2018-03-10 00:13:41 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
4eb7d7a332 Debug blockedlog with various payments 2018-01-29 18:22:26 +01:00
Laurent Destailleur
7a1a2cf90d Fix send into ledger for bank line record. Show accounted status. 2018-01-22 04:13:29 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
Alexandre SPANGARO
ac95ccd872 FIX : Debug various_payment 2017-12-10 14:05:36 +01:00
Laurent Destailleur
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
Frédéric FRANCE
6a91b16995
info bank 2017-11-25 12:13:03 +01:00
Laurent Destailleur
aaf08ade2f Fix bug reported by scrutinizer 2017-11-25 11:21:31 +01:00
Laurent Destailleur
6a3dc91414 Standardize code 2017-11-23 15:22:32 +01:00
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of = 
Fix a lot of request to use left join on type of payment table
 2017-11-23 15:06:16 +01:00
Laurent Destailleur
ead629708c Look and feel v6 2017-11-17 14:57:14 +01:00
Laurent Destailleur
92753273b9 Fix upload api for invoices and bad id for bank account 2017-11-17 11:44:52 +01:00
Laurent Destailleur
1b28c45e2c PERF Links in getNomUrl use only one tag a instead of 2. 2017-11-02 15:19:14 +01:00
Laurent Destailleur
7b661685cc Debug modBlockedLog module 2017-10-24 15:22:46 +02:00
Laurent Destailleur
c6e5115d34 Set default limit to 100 on all rest api that list 2017-10-22 15:42:19 +02:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-13 11:28:26 +00:00
Laurent Destailleur
5f401839d6 Fix verif 2017-10-12 00:42:48 +02:00
Laurent Destailleur
15bcbc8b43 FIX Check on bank info for sepa must be done on iban/swift not on ban 2017-10-12 00:38:59 +02:00
Laurent Destailleur
31ab73ff3c Fix when verif is called several times 2017-10-12 00:12:26 +02:00
Laurent Destailleur
4c23363400 Fix creation of tax payment 2017-10-07 21:27:18 +02:00
Laurent Destailleur
e40bffb0d5 Fix bug reported by scrutinizer 2017-10-07 20:21:47 +02:00
Laurent Destailleur
f2e0ff0d30 Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict 2017-10-03 17:25: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
Regis Houssin
09e71f1390 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-10-02 11:51:27 +02:00
Regis Houssin
9823d6622c Fix: use default $shared value 2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/rapport/pdf_paiement.class.php
	htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
 2017-09-27 17:22:18 +02:00
gauthier
d270a8e009 FIX : same than precedent commit 2017-09-26 16:09:40 +02:00
gauthier
8de9c5cd36 FIX : forgotten php doc on function parameter 2017-09-26 14:18:26 +02:00
gauthier
7f938bc517 NEW : unexistant function load_state_board() on several objects 2017-09-26 12:32:58 +02:00
Laurent Destailleur
fcdbc66bb1 Merge pull request #7122 from atm-florian/develop_fixtransfert 
NEW : Can transfer from bank account to bank account with different currencies
 2017-09-25 17:36:52 +02:00
Regis Houssin
a03ef95eaa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/tables/llx_c_payment_term.sql
 2017-09-18 09:11:04 +02:00
Laurent Destailleur
3f7b705674 Use correct term accounting for codes 2017-09-18 00:48:09 +02:00
Regis Houssin
db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/class/paymentterm.class.php
 2017-09-15 16:45:49 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Regis Houssin
66e548427c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/resultat/clientfourn.php
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-07 10:50:35 +02:00
Alexandre SPANGARO
84fcbb724e Add project on various_payment 2017-09-01 07:21:27 +02:00
Regis Houssin
2f537a1ade Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/charges/index.php
	htdocs/compta/paiement/list.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-08-22 18:49:40 +02:00
Regis Houssin
0dc0fe81fc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-31 07:40:01 +02:00
GUERRIER Kevin
b6b3ab3f1b NEW Add Next/Previous button on operation date of bank line 
Operation date has to be frequently updated because some bank change them in many case. With this feature, this value can be updated simply like the value date.
 2017-07-29 15:07:27 +02:00
Laurent Destailleur
bdfb0b7561 FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes 2017-07-26 21:22:53 +02:00
Regis Houssin
acd5780e32 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-26 08:58:56 +02:00
florian HENRY
d6d454edc8 fix : Various misspelling class (eclipse Oxygen standard PHP control) 2017-07-25 13:32:27 +02:00
florian HENRY
b9d5f4ba10 fix : Various misspelling class (eclipse Oxygen standard PHP control) 2017-07-24 09:02:32 +02:00
Regis Houssin
200f232164 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-16 07:51:20 +02:00
Laurent Destailleur
cb87b314be FIX Maxi debug of journalization of bank journal. 2017-07-15 03:41:07 +02:00
florian HENRY
ffb8c684d0 NEW : Can transmer from bank account to bank account with different 
currency
 2017-07-06 13:40:26 +02:00
Regis Houssin
909826e24f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-20 06:25:35 +02:00