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

285 Commits

Author SHA1 Message Date
Laurent Destailleur
333dd10874 Add a way to lin on bank receipt tab directly 2015-11-08 02:09:32 +01:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Laurent Destailleur
615734012e Merge pull request #3476 from marcosgdf/refactor 
Refactor: Created hasDelay functions
 2015-09-09 20:50:58 +02:00
Marcos García de La Fuente
2f85d02911 Added missing RemiseCheque properties 2015-09-06 19:24:17 +02:00
Laurent Destailleur
087938e340 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/bank/class/account.class.php
 2015-09-05 10:25:01 +02:00
Laurent Destailleur
6ac4b8d0d4 Merge branch 'patch-2' of https://github.com/open-minds/dolibarr into open-minds-patch-2 2015-09-05 10:22:43 +02:00
Laurent Destailleur
4c0f117e55 Merge pull request #3465 from open-minds/patch-1 
Fix detailed information of BBAN for Germany
 2015-09-05 10:22:12 +02:00
Laurent Destailleur
8bea703363 Fix deadlock feature. Can't reconciliate cash bank account. Sometimes 
users need. I introduce a hidden option to fix this quickly.
 2015-09-04 23:23:39 +02:00
Laurent Destailleur
a66bcf1965 Fix deadlock feature. Can't reconciliate cash bank account. Sometimes 
users need. I introduce a hidden option to fix this quickly.
 2015-09-04 19:42:07 +02:00
Laurent Léonard
11241c51f5 Fix detailed information of BBAN for Belgium 2015-09-04 18:30:54 +02:00
Laurent Léonard
04b3c23692 Fix detailed information of BBAN for Germany 2015-09-04 18:16:43 +02:00
Laurent Destailleur
fc8a822f1d Merge remote-tracking branch 'origin/3.7' into develop 2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:18:02 +02:00
Marcos García de La Fuente
7cb564586e Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything 
Close #3310
 2015-08-09 13:52:02 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Maxime Kohlhaas
5d14d05ce1 Fix : Social contribution payment deletion was not deleting the bank line 2015-07-03 16:38:54 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
Laurent Destailleur
6fa0234409 Uniformize code 2015-04-07 03:00:11 +02:00
Laurent Destailleur
6e251690ab Doxygen 2015-03-17 11:23:45 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Laurent Destailleur
209f8946d0 All files must be lowercase 2015-03-10 14:17:58 +01:00
Laurent Destailleur
8e29dcdb79 Some fix after merging bank account number form 2015-03-04 21:59:03 +01:00
aspangaro
fafebf5b2a NEW: [T1758] Merge bank card & account card 2015-03-02 22:44:11 +01:00
Laurent Destailleur
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00
Laurent Destailleur
41a74c62e2 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:03:17 +01:00
Frédéric FRANCE
b73f1eb827 Update account.class.php 2015-02-19 08:40:38 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
fa55c60c35 Renamed WorkBoardResponse to WorkboardResponse 2015-02-16 23:52:49 +01:00
Marcos García de La Fuente
d5fd20e911 Renamed BoardResponse to WorkBoardResponse 2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
bab0163c44 Missing Copyright info 2015-02-15 15:07:24 +01:00
Marcos García de La Fuente
d1f73499e9 Refactored dashboard indicator 2015-02-15 15:01:28 +01:00
Marcos García de La Fuente
0d6d98b395 PHPDoc and misc fixes for several folders 2015-02-10 13:17:37 +01:00
Marcos García de La Fuente
157a6e109e Misc Adherents PHPDoc corrections 2015-02-10 10:45:48 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
Laurent Destailleur
007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 
GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php
 2015-01-17 15:11:12 +01:00
Laurent Destailleur
87a59ef527 Merge branch 'develop_bank_extrafields' of 
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields

Conflicts:
	htdocs/admin/bank.php
 2015-01-17 14:42:04 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
6d2e024d52 Doxygen 2014-11-23 17:53:44 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer 
Fixed: Solve conflict between ->iban and ->iban_prefix.
 2014-11-22 16:57:08 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Florian HENRY
e9f754395d Start bank extrafields 2014-11-10 13:09:58 +01:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
Laurent Destailleur
ee4d697172 Fix several bugs reported by scrutinizer 2014-09-19 14:57:31 +02:00
Raphaël Doursenaud
eea9a76589 FIX: Variable might not be traversable 2014-09-19 03:07:52 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Marcos García de La Fuente
460fb7a453 Removed new SQL double-debug 2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
aspangaro
5cc8ec4f5f Add accountancy code journal into bank card & modify presentation 2014-06-29 20:10:43 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
a8f784083c Show ref with label on bank account. 2013-10-16 19:00:00 +02:00
Maxime Kohlhaas
00cb2aa26c Fix : wrong var used in bank account class 2013-09-23 10:55:44 +02:00
Maxime Kohlhaas
01e4d905fb Start work on bank sharing for multi-company 2013-07-19 09:19:20 +02:00
Laurent Destailleur
6db9b67e35 Fix: Missing user param 2013-07-13 17:55:36 +02:00
fhenry
37a9686921 Fix bug [ bug #884 ] Warnings on /compta/bank/index.php 2013-05-07 17:06:10 +02:00
Laurent Destailleur
d9e01ae63d Fix: Links when transaction is withdraw has disappeared. 2013-05-01 02:33:29 +02:00
Laurent Destailleur
3896b99bad Add UK with GB. 2013-04-24 19:14:59 +02:00
Grand Philippe
44683a0e21 english language standardization 2013-02-27 11:58:50 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
0af5c434af english standardization 2013-02-22 09:29:34 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
8ea48b28eb New: More complete setup for bank ids according to countries 2012-10-31 00:46:46 +01:00
Laurent Destailleur
1d7820c5ac New: English bank account need a bank code (called sort code) to 
identify an account.
 2012-10-31 00:22:13 +01:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Laurent Destailleur
a429a930d0 Fix: Uniformize code and PHPUnit tests 2012-07-29 20:07:03 +02:00
Laurent Destailleur
fbfff99b80 Fix: Can delete a paiement if bank line was deleted. 2012-03-28 17:26:53 +02:00
Regis Houssin
be7da6f52c Fix: avoid warning in php strict mode 2012-03-23 16:44:45 +01:00
Laurent Destailleur
ab6c1a5160 Qual: Add new PHPUnit test and fix bugs the test show me 2012-03-21 12:33:51 +01:00
Laurent Destailleur
ed41e03589 Qual: Fix a ton of CheckStyle errors 2012-03-18 19:23:01 +01:00
Laurent Destailleur
c89fd4b1e7 New: Can conciliate several lines in one operation. 2012-02-15 12:16:33 +01:00
Laurent Destailleur
070f157f08 Fix: Delete bank account 2012-01-19 23:31:37 +01:00
Laurent Destailleur
d9aa0c4b28 Qual: Normalize field names 2012-01-19 22:20:28 +01:00
Laurent Destailleur
c2348ef600 Uniformize field country_id, country_code, country 2011-12-29 18:07:41 +01:00
Laurent Destailleur
ebea7f6c97 Fix: fix not initialized variables 2011-12-05 18:36:54 +01:00
Regis Houssin
63d60a33fc [task #216] Move lib in core directory 2011-10-24 11:25:54 +02:00
Laurent Destailleur
be6286c4b8 Qual: More POO. 
Qual: Doxygen
 2011-09-20 17:19:46 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Laurent Destailleur
22eae6fae7 Look: Minor look enhancements 2011-08-13 00:47:59 +00:00
Laurent Destailleur
1bcc5d148b Fix: bug #33918 : Écriture bancaire fantôme 2011-08-05 21:05:19 +00:00
Laurent Destailleur
e2c007305c Fix: Avoid errors into rpm packages 2011-07-31 22:21:57 +00:00
Laurent Destailleur
1872f6b12d Fix: pgql compatibility 2011-07-04 10:44:36 +00:00
Laurent Destailleur
8ca0718d5e doxygen 2011-07-04 09:01:37 +00:00
Regis Houssin
9acef01942 Fix: add $num for paypal transaction 2011-06-17 14:56:17 +00:00
Laurent Destailleur
d694a1b1e0 Fix: Retore usage of id because ther is no ref for such objects. All records must have 2 id: 
on technical id (rowid)
on user id (ref).
num_chq can't be used because it is not a unique value, nor a mandatory value
 2011-06-17 10:30:28 +00:00
Regis Houssin
10bb64b2cd Fix: ref is not rowid ?? 2011-06-16 10:53:27 +00:00
Laurent Destailleur
0c80631c70 Doxygen 2011-05-02 21:59:16 +00:00
Laurent Destailleur
2f47f8f0b1 Fix: A account with conciliation disabled should not report warning of record late to reconciliate 2011-05-01 17:46:00 +00:00
Laurent Destailleur
d1ed609684 Qual: Removed TODO. Now all password generation use the password generator module. 2011-05-01 10:48:43 +00:00
Laurent Destailleur
519fd1abee Uniformize code 2011-04-13 12:19:38 +00:00
Laurent Destailleur
4536ff2cdc New: Support BSB code for bank account in australia 2011-03-31 15:27:18 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Laurent Destailleur
8b70133797 New: Can link to transactions list of a bank account 2011-02-07 17:51:16 +00:00
Laurent Destailleur
966c1adeab Doxygen 2011-02-07 17:25:27 +00:00
Laurent Destailleur
49eecb38b5 Qual: Uniformize code 2011-02-07 15:59:51 +00:00
Laurent Destailleur
73cf059a52 Fix: Do not show stat on reconciliation if there is no account to reconciliate 2011-02-03 22:29:09 +00:00
Laurent Destailleur
0d8933dd08 Fix: The warning for not reconciliated records was not visible 2010-12-28 22:40:10 +00:00
Laurent Destailleur
8bc3bae49e New: Add suppliers orders to process in dashboard 2010-11-13 17:37:22 +00:00
Laurent Destailleur
39035f1969 Fix: Doxygen 2010-11-13 01:16:48 +00:00
Laurent Destailleur
d9bc203c59 Doxygen 2010-10-27 22:41:40 +00:00
Laurent Destailleur
1918fb582e Mutualize some code 2010-09-09 01:26:07 +00:00
Laurent Destailleur
aec5e4ab52 Mutualize some code 2010-09-08 23:50:52 +00:00
Laurent Destailleur
75f3b9e631 New: Nav works on bank line 2010-08-22 13:40:44 +00:00
Laurent Destailleur
5be0cb859e Fix: Use good payment type 2010-08-14 01:42:59 +00:00
Laurent Destailleur
186622e235 Fix: Database compatibility 2010-08-09 16:07:24 +00:00
Laurent Destailleur
fc2213a8f1 Doxygen 2010-07-21 12:35:56 +00:00
Laurent Destailleur
d46ed0c984 Fix: Doxygen documentation 
Removed deprecated files
 2010-07-21 11:21:37 +00:00
Laurent Destailleur
5ea293091b New: Reorganize bank menu. Add state and country on bank accounts. 2010-06-25 00:14:23 +00:00
Laurent Destailleur
a35ed5d756 New: IBAN value is called IFSC if country is India 2010-06-17 21:43:46 +00:00
Laurent Destailleur
a8928461f3 New: IBAN value is called IFSC if country is India 2010-06-17 21:43:46 +00:00
Laurent Destailleur
815e84404c New: Bank name in PDF 2010-06-17 21:19:00 +00:00
Laurent Destailleur
33d88a661f Remove pdate 2010-05-08 17:17:17 +00:00
Philippe Grand
16a8ab7d59 according to new tree directory 2010-04-29 14:54:12 +00:00
Philippe Grand
b65ddfabe8 according to new tree directory 2010-04-28 21:29:12 +00:00
Philippe Grand
b6bc9223df according to new tree directory 2010-04-28 10:33:16 +00:00
Philippe Grand
b68a359265 according to new tree directory 2010-04-28 10:02:54 +00:00
Laurent Destailleur
a4f144f24d Qual: Uniformise code. user class use id in first param of fetch 2010-04-28 07:31:34 +00:00
Philippe Grand
719913376c according to new tree directory 2010-04-25 12:48:58 +00:00
Philippe Grand
ba3a06758c according to new tree directory 2010-04-25 12:43:27 +00:00