Commit Graph

8114 Commits

Author SHA1 Message Date
Laurent Destailleur
7662f8f25c Fix balance 2018-07-17 21:39:41 +02:00
Laurent Destailleur
a7853211d6 Fix balance when sorting of value date desc 2018-07-17 21:20:38 +02:00
Laurent Destailleur
1b33703cd8 Fix missing country code 2018-07-13 09:08:42 +02:00
gauthier
80ff7fa86f FIX : case when we valid form with keyboard 2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06 FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied) 2018-07-11 09:51:36 +02:00
Laurent Destailleur
ed6ec8138d Fix filter on invoice status 2018-07-06 16:06:15 +02:00
Laurent Destailleur
6c5264fabb Fix label 2018-07-06 12:45:20 +02:00
Laurent Destailleur
3c176adb38 Fix more complete fix for bad label in creating invoice from other obj 2018-07-02 16:46:30 +02:00
Laurent Destailleur
cae7cabe6d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-02 16:22:55 +02:00
Laurent Destailleur
b22754c60b FIX label of source object 2018-07-02 16:22:40 +02:00
Laurent Destailleur
4e7f9b1b4d Merge pull request #9038 from hregis/8.0_multicompany
Fix: possibility to overload permissions (multicompany sharing)
2018-07-02 16:12:40 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
2018-07-02 12:16:51 +02:00
Laurent Destailleur
11021353da Fix text in payment area of crabe pdf 2018-07-02 11:33:33 +02:00
Regis Houssin
26495fb698 Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!! 2018-07-01 18:49:37 +02:00
Laurent Destailleur
da138db528 FIX combo into popup become crazy with IE10
Conflicts:
	htdocs/asset/card.php
	htdocs/modulebuilder/template/myobject_card.php
2018-06-28 12:16:12 +02:00
Laurent Destailleur
3ea2d81279 FIX combo into popup become crazy with IE10 2018-06-28 12:05:02 +02:00
Laurent Destailleur
969b272576 Rename menu entries and report title for better understanding 2018-06-26 11:18:31 +02:00
Laurent Destailleur
5c93fa1bfb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/journals_list.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
7f8570f720 Fix lang loading 2018-06-26 00:48:43 +02:00
Laurent Destailleur
af9d2c3b5a Merge pull request #9008 from grandoc/new_branch_22_06_2018
clean and update code
2018-06-24 13:47:26 +02:00
Laurent Destailleur
0170906524 Look and feel 2018-06-23 14:39:24 +02:00
Laurent Destailleur
7daee6dc6b A lot of fix of css and look and feel v8 2018-06-23 00:07:56 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Philippe GRAND
afda5288a8 clean and update code 2018-06-22 16:27:11 +02:00
Laurent Destailleur
5bee324578 Update paiement.class.php 2018-06-22 14:34:59 +02:00
Laurent Destailleur
d81398e72d Fix info on tooltip 2018-06-18 16:27:25 +02:00
Laurent Destailleur
ad2df304b4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/fourn/commande/card.php
	htdocs/societe/class/societe.class.php
2018-06-18 13:31:29 +02:00
Laurent Destailleur
95ee3325fc Part of fix of #8972 2018-06-18 11:11:07 +02:00
Philippe GRAND
4c08e2ebf3 clean and update code 2018-06-17 14:33:29 +02:00
Laurent Destailleur
7c7ee56832 Fix missing email
Fix avoid warning
2018-06-17 01:50:10 +02:00
Ferran Marcet
a21e138c70 Fix: Avoid converting into reduction twice and draft invoice 2018-06-15 11:19:04 +02:00
Laurent Destailleur
9717a32a2e Merge pull request #8960 from grandoc/new_branch_13_06_2018
clean code
2018-06-14 12:01:19 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
2018-06-13 23:04:08 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Philippe GRAND
a937d9e657 clean code 2018-06-13 22:52:24 +02:00
Laurent Destailleur
c586f2ecf7 Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE
FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise
2018-06-13 21:20:42 +02:00
Laurent Destailleur
3703a7c4b0 Merge pull request #8952 from papoteur-mga/patch-1
Fix: In list of bank accounts, display the balance in formatted price
2018-06-13 20:40:27 +02:00
altatof
d42f00bca9 FIX : pu_ht_devise was not converted to numeric so decimals were lost
when clculating total_ht_devise
2018-06-13 16:35:52 +02:00
Papoteur
6567365086 In list of bank accounts, display the balance in formatted price
[Problem to solve]
in compta/bank/list.php, the balance can be displayed witht decimal or not. This is not fine.
[Solution]
Change a parameter in the price function to format the balance with the required number of decimals.
2018-06-13 08:39:26 +02:00
Marc de Lima Lucio
e992187f4c FIX: handle sortorder on multiple columns + potential SQL field mismatch 2018-06-12 16:00:16 +02:00
Regis Houssin
7ce2ebf1a9 Fix: wrong var name 2018-06-07 16:25:47 +02:00
Laurent Destailleur
a7b38db31f Fix bug reported by scrutinizer 2018-06-06 18:55:50 +02:00
Laurent Destailleur
b57f3a3f36 Fix bug reported by scrutinizer 2018-06-06 18:41:35 +02:00
Laurent Destailleur
6b24d81afc Fix bug reported by scrutinizer 2018-06-06 18:40:56 +02:00
Laurent Destailleur
a8e06abc4f Fix bug reported by scrutinizer 2018-06-06 18:35:11 +02:00
gauthier
77e7932671 FIX : sometimes amounts are identical but php find them different. 2018-06-05 11:33:58 +02:00
Laurent Destailleur
40ab046bd1 Merge pull request #8904 from Mavyre/develop
FIX Errors on synchronize rates when accessing Dolibarr from HTTPS
2018-06-04 13:46:03 +02:00
Laurent Destailleur
7c0afbe025 Clean code 2018-05-31 17:12:08 +02:00
Mavyre
6b86e1c3bb FIX Bookkeeping report wrong display 2018-05-30 21:38:57 +02:00