Laurent Destailleur
|
184d52525a
|
PHP code to manage pair/impair is replaced by native CSS.
|
2017-03-07 22:45:22 +01:00 |
|
Laurent Destailleur
|
4e4045d18a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-03-05 22:12:08 +01:00 |
|
Laurent Destailleur
|
5f79b2d0c6
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2017-03-05 22:11:35 +01:00 |
|
Laurent Destailleur
|
2a1060c0fc
|
Merge pull request #6475 from defrance/patch-87
Situation total row left a col if bank enabled
|
2017-03-05 21:39:02 +01:00 |
|
Laurent Destailleur
|
f67c967d0b
|
FIX The vat rate line used when adding a predefined product was wrong if
there is several vat line with same rate.
|
2017-03-04 22:27:44 +01:00 |
|
Laurent Destailleur
|
29953b46cd
|
Fix css
|
2017-03-03 15:32:34 +01:00 |
|
Laurent Destailleur
|
6ee286f5f7
|
FIX #6404
|
2017-03-03 15:11:41 +01:00 |
|
Laurent Destailleur
|
28ad50e059
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
|
2017-03-03 14:31:35 +01:00 |
|
Laurent Destailleur
|
be86664e43
|
FIX #6449
|
2017-03-03 14:27:01 +01:00 |
|
Laurent Destailleur
|
ea08c929c0
|
FIX #6476
|
2017-03-03 14:08:19 +01:00 |
|
Laurent Destailleur
|
0dd8db9073
|
Fix bank account label missing
|
2017-03-02 01:46:51 +01:00 |
|
Laurent Destailleur
|
d67d83515a
|
Fix dol_banner usage
|
2017-03-02 01:40:53 +01:00 |
|
Laurent Destailleur
|
1562df8f93
|
Fix responsive design
|
2017-03-02 01:26:15 +01:00 |
|
BENKE Charlie
|
706dd838c9
|
Situation total row left a col if bank enabled
|
2017-03-01 11:21:49 +01:00 |
|
Laurent Destailleur
|
821324868a
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-27 12:15:31 +01:00 |
|
Laurent Destailleur
|
d5dc88d66b
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-02-27 12:08:18 +01:00 |
|
Laurent Destailleur
|
f579fc6b2d
|
Code comment
|
2017-02-27 12:07:38 +01:00 |
|
Laurent Destailleur
|
1be389fd3e
|
FIX deletion of bank tag
|
2017-02-27 12:06:45 +01:00 |
|
Laurent Destailleur
|
4572a78618
|
Fix bad table deleted
|
2017-02-27 12:03:20 +01:00 |
|
Laurent Destailleur
|
c210b2349d
|
Fix bad table
|
2017-02-27 11:59:18 +01:00 |
|
Laurent Destailleur
|
0d07ad8c69
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/compta/bank/card.php
htdocs/compta/bank/class/account.class.php
|
2017-02-27 11:58:35 +01:00 |
|
Laurent Destailleur
|
d9ba06e224
|
Fix bad table
|
2017-02-27 11:42:11 +01:00 |
|
Laurent Destailleur
|
10838983b5
|
FIX error management in bank account deletion.
|
2017-02-27 11:38:19 +01:00 |
|
Laurent Destailleur
|
024cecec29
|
FIX Error management during bank account creation
|
2017-02-27 11:16:46 +01:00 |
|
Laurent Destailleur
|
0f8a8869cb
|
FIX Error management during bank account creation
|
2017-02-27 11:15:59 +01:00 |
|
Laurent Destailleur
|
cff284b2f3
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/compta/bank/categ.php
|
2017-02-27 10:55:18 +01:00 |
|
Laurent Destailleur
|
9ecc56ad4d
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2017-02-27 10:48:36 +01:00 |
|
Laurent Destailleur
|
3aaf9dae11
|
Fix parameter to cal cron method
|
2017-02-27 00:12:48 +01:00 |
|
Laurent Destailleur
|
29578a38bd
|
Keep previous behaviour if new option not set
|
2017-02-24 16:19:00 +01:00 |
|
Laurent Destailleur
|
7ee6dc7fa6
|
Merge pull request #6388 from atm-ph/new_deposit_with_multi_tva_management
New deposit with multi tva management
|
2017-02-24 16:16:33 +01:00 |
|
Laurent Destailleur
|
fb88eaf2a4
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-02-23 02:55:50 +01:00 |
|
Laurent Destailleur
|
19e60f03b9
|
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
|
2017-02-21 14:17:44 +01:00 |
|
Laurent Destailleur
|
ebe625aa16
|
Fix debug direct debit module
|
2017-02-21 13:16:28 +01:00 |
|
Laurent Destailleur
|
eef3824f8c
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
|
2017-02-21 10:34:52 +01:00 |
|
Raphaël Doursenaud
|
b697da7399
|
Fix: [Payments] Properly escape variable for JS
The company name may contain reserved characters such as a quote
which needs proper escaping to prevent upsetting the JavaScript
interpreter.
|
2017-02-17 16:16:41 +01:00 |
|
Laurent Destailleur
|
498473715e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-17 01:48:43 +01:00 |
|
Laurent Destailleur
|
4c310964a9
|
Fix list of supplier proposals
|
2017-02-17 01:41:33 +01:00 |
|
Laurent Destailleur
|
4a8006b330
|
Fix style
|
2017-02-16 23:15:47 +01:00 |
|
Laurent Destailleur
|
d72e5a3646
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-10 17:34:23 +01:00 |
|
Laurent Destailleur
|
ca67917e80
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/modules/modFacture.class.php
|
2017-02-10 17:33:32 +01:00 |
|
Laurent Destailleur
|
d461c0dfa4
|
Fix left align
|
2017-02-10 10:47:19 +01:00 |
|
Laurent Destailleur
|
66542b6367
|
Fix translation and link to direct debit payment
|
2017-02-10 10:43:54 +01:00 |
|
phf
|
579d350599
|
Fix keep the standard behaviour
|
2017-02-09 17:41:06 +01:00 |
|
gauthier
|
c01988ba43
|
FIX : delete bank class lines when we delete bank_categ
|
2017-02-09 17:28:37 +01:00 |
|
florian HENRY
|
ab0783edcc
|
FIX #6234
|
2017-02-08 17:18:06 +01:00 |
|
Laurent Destailleur
|
e1a6e6e4ab
|
Rename "attributes" into "variants" to avoid confusion with extrafields
|
2017-02-08 12:37:38 +01:00 |
|
Laurent Destailleur
|
b24f244f67
|
Merge pull request #5533 from marcosgdf/prod-attr
Feature Request: NEW Added product attributes feature
|
2017-02-08 11:20:33 +01:00 |
|
Laurent Destailleur
|
b611c5ca53
|
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
NEW Develop new reduc on excess received
|
2017-02-08 11:16:10 +01:00 |
|
Laurent Destailleur
|
31c3398b7f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/modules.php
|
2017-02-08 10:59:05 +01:00 |
|
phf
|
6b20bad847
|
add fixme
|
2017-02-07 11:14:27 +01:00 |
|