Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 12:01:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,347 Commits 36 Branches 190 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

2305 Commits

Author SHA1 Message Date
Laurent Destailleur
ee8b5030a0 Merge pull request #9610 from atm-john/FIX_situation_credit_note 
Fix situation credit note
 2018-09-27 09:26:23 +02:00
Laurent Destailleur
e3b1cb9fdb Update facture.class.php 2018-09-27 09:25:37 +02:00
John BOTELLA
022f842cb0 Fix display good progress for new situation invoices 2018-09-25 10:28:47 +02:00
John BOTELLA
791c373db5 FIX credit note progression 2018-09-25 09:54:58 +02:00
John BOTELLA
b1380a6902 FIX situation invoice total with credit note 2018-09-24 16:12:00 +02:00
Laurent Destailleur
57e359cd40 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:18:13 +02:00
Laurent Destailleur
dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:14:38 +02:00
Laurent Destailleur
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Laurent Destailleur
3662ebe3a3 Fix syntax error 2018-09-12 18:05:20 +02:00
Maxime Kohlhaas
c94689e9a9 FIX remain to pay for credit note was wrong on invoice list 2018-09-12 11:53:57 +02:00
Laurent Destailleur
aad6a0871f FIX Lose filter on payment type or category after a sort on invoice list 
Conflicts:
	htdocs/compta/facture/list.php
 2018-09-12 10:59:53 +02:00
Laurent Destailleur
7bea9f5ffb FIX Lose filter on payment type or category after a sort on invoice list 2018-09-12 10:57:09 +02:00
Maxime Kohlhaas
a5f4a74ecc FIX : Homepage links were using wrong topmenus 2018-09-06 14:49:48 +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
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
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
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
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
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
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