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

1051 Commits

Author SHA1 Message Date
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
aspangaro
fa6941efc6 Merge branch 'Upstream/develop' 2014-09-04 04:23:19 +02:00
aspangaro
2cba7ab9e6 Card presentation 2014-09-04 04:22:43 +02:00
Laurent Destailleur
1eaf615426 Fix: no br after title 2014-09-03 14:32:59 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Laurent Destailleur
605919be76 Fix: Too many parameter 
Fix: Can't delete bank account
 2014-08-01 14:51:40 +02:00
Laurent Destailleur
07cf09536d Fix: delete bank account 2014-08-01 14:48:48 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
43597c1731 Migrated old error notifications to the """new""" system 2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
ac824728bc Migrated old error notifications to the """new""" system 2014-07-20 01:09:43 +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
frederic34
742bdcb715 Set bank account for supplier invoices 2014-07-09 18:44:20 +02:00
frederic34
865fea37e9 Correct filter 2014-07-08 16:02:46 +02:00
frederic34
a2911cef11 Filter on invoice for "treso" 2014-07-08 11:46:22 +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
aspangaro
516363f491 Bank - Enhance readability 2014-06-17 06:43:50 +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
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +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
frederic34
88c5d6e5d1 Display the total with currency 2014-06-11 18:01:14 +02:00
frederic34
89547dde37 Display the total by currency account 2014-06-11 17:42:03 +02:00
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Raphaël Doursenaud
3209483f1b Bank search: Better wording 2014-05-19 14:38:26 +02:00
Laurent Destailleur
76330ad04a Fix: [ bug #1383 ] When add a salary payment - In bank, link "user" 
doesn't work
 2014-05-11 18:35:25 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +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
Marcos García de La Fuente
5d46115dd3 Missing translation of transaction types in releve detail 2014-05-01 16:32:04 +02:00
aspangaro
bab54f8264 Type bank & tva 2014-04-28 06:41:27 +02:00
aspangaro
73eec6b872 Fix :: Key language "Thirdparty" not traduced when module thirdparty is deactivated 2014-04-28 04:53:39 +02:00
Florian Henry
0d1697589e syntax 2014-04-13 20:39:40 +02:00
Florian Henry
7d84c573ab syntax travis ruleset.xml 2014-04-13 18:57:35 +02:00
Florian Henry
57e4453ea2 Add filter date and total line on bank writing list page 2014-04-13 18:26:21 +02:00
Laurent Destailleur
9a8a306d78 Qual: Method form->select_currency() has been removed. Use instead 
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
 2014-04-02 14:53:42 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
a5c2b78565 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-29 17:38:06 +01:00
Laurent Destailleur
61f649e1ae Fix: When select_date is called with '' as preselected date, 
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
 2014-03-29 04:26:44 +01:00
Florian Henry
c8c4a10a06 Fix restrictedearea bug 2014-03-21 16:18:17 +01:00
Laurent Destailleur
2889c3ac70 Qual: Feature to make payment of salaries has been moved into a module 
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
 2014-03-17 14:30:55 +01:00
aspangaro
12ffb19cec Use more explicit name for class and functions 2014-03-11 06:26:18 +01:00
aspangaro
61a5735300 Rename "Sal" class into "Salaries" 2014-03-10 21:17:03 +01:00
aspangaro
048b3c01ce Add salary payment in tax module - Link to user. 
Necessary for future hrm module.
 2014-03-06 21:21:16 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
 2014-02-10 01:30:48 +01:00
Laurent Destailleur
e71fb36b3c Add patch ISO 9362 http://fr.wikipedia.org/wiki/ISO_9362 manually. 
We keep bic size field to 20 instead of 11 for backward compatibility.
 2014-02-10 01:08:49 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Grand Philippe
c5689b86b4 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 09:43:21 +01:00
Laurent Destailleur
6c26684284 Fix: [ bug #1166 ] Supplier account number in its card does not respect 
order set in Banks module.
 2013-12-01 23:17:16 +01:00
aspangaro
bb69fcf0d7 Fix for language 2013-11-09 07:00:59 +01:00
Laurent Destailleur
521b3a89bf Fix: current balance was visible when it should not 2013-11-06 15:31:56 +01:00
Laurent Destailleur
a8f784083c Show ref with label on bank account. 2013-10-16 19:00:00 +02:00
Laurent Destailleur
a11a0d6491 Fix: debug replanishment feature 2013-10-09 21:09:15 +02:00
Maxime Kohlhaas
383e07d102 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-09-26 18:20:12 +02:00
Maxime Kohlhaas
00cb2aa26c Fix : wrong var used in bank account class 2013-09-23 10:55:44 +02:00
Laurent Destailleur
b57ed72fc1 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 20:01:33 +02:00
Laurent Destailleur
53979ad58c Fix: Bad param 2013-09-20 14:29:09 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Laurent Destailleur
7f549e60f2 Fix: Bad selection of years into graphics 2013-08-27 12:02:33 +02:00
Laurent Destailleur
2336a260d3 New: Add line "minimum amount desired into bank graph". 2013-08-05 18:54:03 +02:00
Laurent Destailleur
37592afa7e New: Add hidden option BANK_DISABLE_DIRECT_INPUT 2013-07-31 18:40:09 +02:00
Laurent Destailleur
de41e9e9c7 Qual: More responsive design 2013-07-26 12:45:31 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Maxime Kohlhaas
196bce7e11 Add link to RemiseCheque in account lines 2013-07-19 10:23:08 +02:00
Maxime Kohlhaas
01e4d905fb Start work on bank sharing for multi-company 2013-07-19 09:19:20 +02:00
Laurent Destailleur
4608e07753 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/bank/account.php
 2013-07-13 23:41:32 +02:00
Laurent Destailleur
3a9ffb19c3 fix: eol 2013-07-13 21:14:05 +02:00
Laurent Destailleur
73a33a6dae Fix: Bug to delete bank line 2013-07-13 17:56:23 +02:00
Laurent Destailleur
6db9b67e35 Fix: Missing user param 2013-07-13 17:55:36 +02:00
Laurent Destailleur
d06e9efc0f Fix: Bug to delete bank line 2013-07-13 17:55:14 +02:00
Laurent Destailleur
41cb5ec235 Fix: Missing label 2013-07-13 17:25:10 +02:00
Regis Houssin
4cd6ae6bbd Fix: convert lines delimiters 2013-06-24 17:36:33 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
b49a1168e3 Fix: Use div for tables when there is a different form on each line. 2013-06-23 18:33:03 +02:00
Laurent Destailleur
1d2f09688e Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 14:38:33 +02:00
Laurent Destailleur
3662638064 Fix: Css for fieldset 2013-06-23 14:37:09 +02:00
Laurent Destailleur
355c770f97 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 13:04:00 +02:00
Laurent Destailleur
e5eb5492e9 Fix: W3C 2013-06-23 13:03:06 +02:00
Laurent Destailleur
fc62f6f7d6 Fix: Search filter was lost 2013-06-23 13:00:02 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
4133bfc3a4 Fix: Ton of bugs into bank categ editor (W3C, update error, syntax 
error...)
 2013-05-31 11:15:13 +02:00
Laurent Destailleur
bbb843ec58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-15 19:30:57 +02:00
Laurent Destailleur
85eac29925 New: Add balance before and after column 2013-05-15 19:30:32 +02:00
simnandez
2981d4a1ec Fix: Remove windows CR/LF 2013-05-15 18:14:37 +02:00
Laurent Destailleur
d7e9236455 Fix: Missing include 2013-05-14 01:31:04 +02:00
Laurent Destailleur
559bbdf19a Merge pull request #944 from defrance69/patch-8 
Update annuel.php
 2013-05-13 15:40:43 -07:00
Laurent Destailleur
2c05d99742 Qual: Uniformize code 2013-05-12 20:10:16 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
BENKE Charles
ea130724b1 Update annuel.php 
Add Debt and Cred graphic at the bottom of the page
 2013-05-10 23:16:41 +02:00
simnandez
bf043fc845 Fix: Remove windows CR/LF 2013-05-08 09:28:05 +02:00
fhenry
37a9686921 Fix bug [ bug #884 ] Warnings on /compta/bank/index.php 2013-05-07 17:06:10 +02:00
Marcos García
44ef25a367 Converted recent changes to UTF-8 encoding 2013-05-06 18:10:41 +02:00
BENKE Charles
5c766d255f Update categ.php 
Add update label feature
 2013-05-03 16:02:04 +03:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
5b85adfb90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/bank/account.php
 2013-05-01 02:35:27 +02:00
Laurent Destailleur
d9e01ae63d Fix: Links when transaction is withdraw has disappeared. 2013-05-01 02:33:29 +02:00
Laurent Destailleur
43d64cca1b Fix: Links when transaction is withdraw has disappeared. 2013-05-01 02:28:14 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
3896b99bad Add UK with GB. 2013-04-24 19:14:59 +02:00
Regis Houssin
5c50b1db57 Fix: use empty instead isset 2013-04-17 10:42:44 +02:00
Regis Houssin
4c13a4049c Fix: use empty instead isset 2013-04-17 10:41:54 +02:00
Laurent Destailleur
b7edb3f472 Fix: Correct css 2013-04-15 18:04:22 +02:00
Laurent Destailleur
37e54b3d80 Qual: Update copyright files. 
Qual: Removed not used library.
Look: Uniformize css.
 2013-04-15 18:00:20 +02:00
Laurent Destailleur
de2ddc02e4 Qual: Another clean of menu management system. Removed all files 
pre.inc.php
 2013-04-15 13:11:29 +02:00
Laurent Destailleur
62893c2ae4 Qual: uniformize code to use function de set with and height for graphs 2013-04-12 17:08:54 +02:00
Laurent Destailleur
59dfab9d21 Fix: regresson after rename of fields 2013-04-07 15:43:21 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Grand Philippe
7f61061805 fix : wrong URL 2013-03-23 19:08:02 +01:00
Grand Philippe
e506601214 display enhancement and standardize 2013-03-22 10:48:14 +01:00
Laurent Destailleur
710585d4c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-07 22:40:12 +01:00
Laurent Destailleur
6cac84b222 Fix: Some fixes into reconciliate page 2013-03-07 22:39:57 +01:00
Laurent Destailleur
b060e5961b Qual: Another step in men manager rewrite. 2013-03-07 19:47:03 +01: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
303577a7fa english standardization 2013-02-22 09:36:01 +01:00
Grand Philippe
0af5c434af english standardization 2013-02-22 09:29:34 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +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
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
2d0dea18ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/bank/search.php
 2012-12-29 17:38:12 +01:00
fhenry
5099bc5e89 Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 16:06:11 +01:00
fhenry
32966fe25f Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 16:02:02 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Laurent Destailleur
8709933288 Fix: Too much sanitizing 2012-11-03 00:47:09 +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
Regis Houssin
67f40fcd1e Fix: works on security 2012-10-13 10:39:16 +02:00
Laurent Destailleur
bdb7becbc6 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:04 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Laurent Destailleur
a18187620e [ bug #512 ] Filter system not working in banks > account > transactions 2012-08-26 19:23:08 +02:00
Marcos García
752c867882 I like more this variable name :D 2012-08-23 09:45:52 +02:00
Marcos García
cb29cfed7b Translations + Little refactor 2012-08-23 09:43:13 +02:00
Regis Houssin
51d3d33947 Merge pull request #339 from marcosgdf/bug-511 
Fixed bug #511
 2012-08-23 00:02:23 -07:00
Marcos García
fcb4f5ce67 Renamed MySQL alias that could cause conflicts 2012-08-23 09:00:31 +02:00
Marcos García
43e4f139d5 Fixed bug #511 
A pagination problem was causing duplicated records
https://doliforge.org/tracker/?func=detail&aid=511&group_id=144
 2012-08-23 08:21:32 +02: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
37c4898720 Removed "./" in require statements 
It does not make any sense to do that
 2012-08-23 01:43:44 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +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