Juanjo Menent
334c14d088
Fix: Last page total is 0
2015-10-18 11:56:42 +02:00
Laurent Destailleur
942723ff8d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-31 12:13:35 +02:00
Laurent Destailleur
47ea834516
Fix debug module expense report
2015-08-28 20:11:16 +02:00
Raphaël Doursenaud
33ea968b5b
Fix #3218 Bank date selectors presentation
2015-08-26 19:45:32 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
aspangaro
4627e72f59
Debug && PSR2
2015-07-04 00:01:40 +02:00
aspangaro
111e44493a
Disable button add a line in bank module when accountancy module is activated
2015-07-03 06:48:49 +02:00
aspangaro
d92eab49de
Add the payment in bank module
2015-06-16 05:47:24 +02:00
Florian HENRY
0331ddc2de
fix spacing
2015-05-20 11:30:27 +02:00
Florian HENRY
df4ee9562f
fix spell
2015-05-20 11:29:35 +02:00
Florian HENRY
6e6b66e416
apply recommandation from
...
ca53d3b602 (commitcomment-11245627)
2015-05-20 11:24:23 +02:00
Florian HENRY
ee1aa3268c
working account
2015-05-19 11:55:45 +02:00
Florian HENRY
a6c5a247cd
add total and title in page records banck account
2015-05-18 11:08:27 +02:00
Florian HENRY
ca53d3b602
NEW : add date value filter on account records list
2015-05-18 10:43:54 +02:00
Laurent Destailleur
976211b70f
Look enhancement
2015-05-15 12:53:14 +02:00
Laurent Destailleur
3e94cc07d2
Fight against valign="top". Minor css fixes.
2015-05-14 16:47:15 +02:00
Raphaël Doursenaud
aee61aa2c4
[Qual] Fixed deprecated HTML nowrap attribute to class
2015-05-12 15:37:35 +02:00
Raphaël Doursenaud
5d2f081152
[Qual] Fixed HTML select form selected attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
aspangaro
560150fd1c
Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default)
2015-04-22 07:15:17 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Laurent Destailleur
503a4ff7a0
Enhance filtering for bank transaction and timesheet.
2015-04-09 20:40:49 +02:00
aspangaro
309b059089
New: Add a button to purge criteria in bank lines list
2015-03-31 21:00:22 +02:00
aspangaro
ce6df7c022
Debug
2015-03-29 09:20:32 +02:00
aspangaro
77b123cb2d
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-27 06:30:35 +01:00
aspangaro
a39f81b1a6
FIXED: Correct path of loan class
2015-03-26 20:51:27 +01:00
aspangaro
b60f1e33d6
Debug
2015-03-26 06:29:16 +01:00
aspangaro
2b2b43afb6
Dir "Don"
2015-03-25 22:37:14 +01:00
aspangaro
9d34b40897
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/compta/bank/account.php
2015-03-24 05:28:57 +01:00
aspangaro
b4b3c45dbc
Update works
2015-03-21 18:00:16 +01:00
aspangaro
63099727d0
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-21 15:10:35 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
aspangaro
c70539b3b2
Bug & merge
2014-11-12 07:33:03 +01:00
aspangaro
7e11fa06bb
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-05 16:35:38 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
aspangaro
3627f157d2
Add langs & debug
2014-10-01 07:16:29 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Marcos García de La Fuente
7bac9444e6
[ bug #1546 ] Incorrect page number when searching in the list of bank transactions
2014-09-14 14:32:17 +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
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
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
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +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
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
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
