Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,848 Commits 35 Branches 179 Tags 1.7 GiB
f8b0e535fa
Commit Graph

8097 Commits

Author SHA1 Message Date
Maxime Kohlhaas
a5f4a74ecc FIX : Homepage links were using wrong topmenus 2018-09-06 14:49:48 +02:00
Philippe GRAND
9025fd5891 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2018-09-06 14:33:46 +02:00
Philippe GRAND
844333688b typo 2018-09-06 14:33:22 +02:00
Laurent Destailleur
9042d341f0 FIX #9316 Error when listing invoices 2018-09-04 11:19:31 +02:00
Laurent Destailleur
e7d2bcc34c FIX #9316 Error when listing invoices 2018-09-04 11:17:08 +02:00
Laurent Destailleur
9697bdf3b0 FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES 2018-09-04 10:38:09 +02:00
Laurent Destailleur
db6f80e2ff FIX invoice popup hide localtax2 and 3 if not defined 2018-09-04 00:42:15 +02:00
Laurent Destailleur
3d50c454c1 Code comment 2018-09-03 17:05:44 +02:00
Laurent Destailleur
6af8f8f475 Fix trans 2018-08-31 16:57:50 +02:00
Laurent Destailleur
b5c2383f65 Fix type of invoice encoded twice 2018-08-28 18:34:53 +02:00
Laurent Destailleur
a82d86cec4 FIX warning for late template invoices to remove when suspended 2018-08-24 10:46:47 +02:00
Laurent Destailleur
8032c314d4
Merge pull request #9252 from bugness-chl/8.0-2 
FIX adding GROUP BY for PostgreSQL
 2018-08-21 12:51:56 +02:00
Laurent Destailleur
116f4a1a09 Fix responsive 2018-08-19 02:22:12 +02:00
Chl
9e8485c279 FIX adding GROUP BY for PostgreSQL 2018-08-16 01:14:42 +02:00
Laurent Destailleur
b977c3a9f5 Fix translation 2018-08-13 14:04:10 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Laurent Destailleur
2d571acc03 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
 2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
ATM-Nicolas
d8d54d246c FIX : Pagination on withdraw request list 2018-08-10 15:05:21 +02:00
Laurent Destailleur
e85ec19018
Merge pull request #9093 from atm-gauthier/FIX_filters 
FIX : page must always be 0 when we search
 2018-08-02 17:48:35 +02:00
John BOTELLA
4ddca02bb9 fix situation line's total 2018-07-31 14:58:33 +02:00
Laurent Destailleur
ece655a84a
Merge pull request #9128 from atm-john/fix_situation_invoice_status 
Fix situation invoice status
 2018-07-24 17:49:53 +02:00
Laurent Destailleur
869a97c8d1
Update card.php 2018-07-24 17:49:10 +02:00
Laurent Destailleur
a469f841f7
Merge pull request #9140 from bugness-chl/8.0-bugfix-pdf 
FIX 2 bugfix for PDF generated by Templates/Cron: DueDate and translation
 2018-07-24 17:47:37 +02:00
Laurent Destailleur
bb9c53b41f
Merge pull request #9118 from bugness-chl/8.0 
corr. "group by" for PostgreSQL
 2018-07-24 17:43:36 +02:00
Chl
0f115dafee 2 bugfix for PDF generated by Templates/Cron: DueDate and translation 
When launching Cron on a facturerec with auto_validate at 1, the
generated PDF doesn't contain the DueDate, and some tokens like
__INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not
translated (tested with fr_FR).
 2018-07-24 00:39:21 +02:00
John BOTELLA
0c01f6e139 Fix situation invoice status 2018-07-20 15:53:32 +02:00
Laurent Destailleur
5523312f87 Fix missing email 2018-07-18 15:36:07 +02:00
Laurent Destailleur
bef777e19d Fix default order for bank entry list 2018-07-18 14:24:58 +02:00
Chl
b306394c15 corr. group by pour PostgreSQL 2018-07-17 23:57:21 +02:00
Laurent Destailleur
cecb0f8829 Fix missing lib 2018-07-17 22:33:20 +02:00
Laurent Destailleur
969aea98e1 Fix label of copy must not be same 2018-07-17 22:31:28 +02:00
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
Laurent Destailleur
d8d4d15b4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-30 12:13:40 +02:00
Laurent Destailleur
de59892438 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 12:13:18 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines 
soft limit length of lines to 500 chars
 2018-05-30 11:19:29 +02:00
Laurent Destailleur
3733169120 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/recap-compta.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 11:09:53 +02:00
florian HENRY
b65b545e0f add hook on balence pages 2018-05-29 16:29:14 +02:00
Laurent Destailleur
4d60fb3468 Fix size of popup 2018-05-29 10:57:14 +02:00
Laurent Destailleur
323bf6ef1f
Merge pull request #8873 from frederic34/loadlangs 
loadlangs
 2018-05-29 10:07:10 +02:00
Laurent Destailleur
f83dedf1b0 Fix space/tab 2018-05-29 10:04:20 +02:00
Neil Orley
748be12da2 Get external contacts ids instead of BILLING contacts ids. 2018-05-28 09:42:24 +02:00
Neil Orley
4ad1f81ea9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2018-05-28 09:30:21 +02:00
Laurent Destailleur
5da89e1cad Remove log 2018-05-27 19:33:46 +02:00
Laurent Destailleur
f3f252e88b Fix duplicate record before creating primary key 2018-05-27 19:31:03 +02:00
Frédéric FRANCE
5c8f966898
Merge remote-tracking branch 'upstream/develop' into loadlangs 2018-05-27 18:41:17 +02:00
Laurent Destailleur
3f489ee3c6 Fix look and feel v7 for popup on ref of social contributions payments 2018-05-27 17:58:32 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
Frédéric FRANCE
84f2b31d46
loadlangs 2018-05-27 09:40:17 +02:00
Frédéric FRANCE
4d5c28b597
loadlangs 2018-05-27 09:27:09 +02:00