Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +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
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
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
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
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Laurent Destailleur
37592afa7e
New: Add hidden option BANK_DISABLE_DIRECT_INPUT
2013-07-31 18:40:09 +02:00
Maxime Kohlhaas
196bce7e11
Add link to RemiseCheque in account lines
2013-07-19 10:23:08 +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
d06e9efc0f
Fix: Bug to delete bank line
2013-07-13 17:55:14 +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
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
2c05d99742
Qual: Uniformize code
2013-05-12 20:10:16 +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
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
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
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
