Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,955 Commits 36 Branches 189 Tags
8b718d0cb1ea04aecf4723625f1750d940f5c38a
Commit Graph

1571 Commits

Author SHA1 Message Date
Laurent Destailleur
27f8096afa Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
0cbc0fa0fc Fix shortkey 2018-12-14 19:33:43 +01:00
Laurent Destailleur
32f51838ec Merge pull request #10083 from aljawaid/aljawaid-improve_access_keys 
NEW: Improve Displaying Access Keys in Navigation
 2018-12-14 19:29:50 +01:00
Laurent Destailleur
d5bbb3033c Update html.form.class.php 2018-12-14 19:29:15 +01:00
Laurent Destailleur
f9c06cdb82 FIX #9498 #10132 2018-12-14 19:04:17 +01:00
Laurent Destailleur
59bc15377d CSS 2018-12-14 18:58:55 +01:00
Laurent Destailleur
4dc32dafaa Merge pull request #10043 from OPEN-DSI/selectcontacts-afterselectoptions-hook 
NEW Add afterSelectContactOptions hook
 2018-12-14 17:35:16 +01:00
Laurent Destailleur
89909ebab0 Update html.form.class.php 2018-12-14 17:32:41 +01:00
Laurent Destailleur
7665c368a2 Merge branch 'develop' into allow_ajax_search_on_product_desc 2018-12-14 17:24:52 +01:00
Laurent Destailleur
88a52aa11d Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
altatof
d5bf9691ee allow product ajax search on description 2018-12-14 15:10:32 +01:00
Laurent Destailleur
dc4a122697 Merge pull request #10224 from fmarcet/develop 
Qual: Better management of select type of lines
 2018-12-14 11:06:33 +01:00
Laurent Destailleur
9bb3382002 Merge pull request #9534 from wdammak/patch-16 
Add the ability to sort products by category
 2018-12-14 10:02:08 +01:00
Laurent Destailleur
e1baf3ab2b Update html.form.class.php 2018-12-14 10:01:12 +01:00
Laurent Destailleur
5d5add641b Fix scrutinizer 2018-12-14 09:58:23 +01:00
Laurent Destailleur
4fc2cefce3 Merge pull request #10181 from aljawaid/aljawaid-override_vat_expense_report 
NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT'
 2018-12-13 20:53:32 +01:00
Laurent Destailleur
3484b50511 Update html.form.class.php 2018-12-13 20:51:45 +01:00
Laurent Destailleur
f97b561af0 Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Ferran Marcet
555698a3af Qual: Better management of select type of lines 2018-12-13 10:36:30 +01:00
Josep Lluís
1c9ccc1442 Fix: add ID property to select objects 
Add ID property to select objects
I.e: id="select_'.$htmlname.'"
 2018-12-07 17:28:31 +01:00
aljawaid
292dd5290a Amend Add Access Keys in Navigation Tooltips 
- Fix travis
 2018-12-07 12:39:20 +00:00
IJ
8bd2efe648 NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT' 
- Setting constant `OVERRIDE_VAT_FOR_EXPENSE_REPORT` to `1` will allow expense reports to show VAT even if the global VAT setting is off
 2018-12-05 12:36:46 +00:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
IJ
30e84f8f2c Amend Add Access Keys in Navigation Tooltips 
- based on suggested code by @eldy
- Added `classfortooltip` for better display
 2018-12-02 10:29:04 +00:00
Maxime Kohlhaas
ad05b531e7 Fix display user photo with new path 2018-12-02 00:02:43 +01:00
Maxime Kohlhaas
09b967bb1b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_user_photo 2018-12-01 23:39:28 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
8c13c87429 Fix path for user photo 2018-12-01 16:55:42 +01:00
Inovea Conseil
18281d9d43 FIX #6580 
FIX #6580
 2018-12-01 16:48:50 +01:00
IJ
825f41bfda Add Access Keys in Navigation Tooltips 2018-11-27 00:22:21 +00:00
wdammak
5c9d5bb6ad order by category 2018-11-23 21:30:34 +01:00
wdammak
5c3daf4a6a order by category 2018-11-23 21:27:22 +01:00
wdammak
064816242a Order by category 2018-11-23 21:26:10 +01:00
Laurent Destailleur
39621ec686 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-11-19 20:07:51 +01:00
Laurent Destailleur
4bedeabc5b FIX #10036 2018-11-19 18:02:29 +01:00
François J
37f3b8bbde Update @since version to 9.0 2018-11-19 17:51:00 +01:00
François J
6aaf0f4655 Add afterSelectOptions hook & selectcontacts context 2018-11-19 17:40:16 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
7a268d8d9f Clean code 2018-10-30 14:27:14 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
47ac420133 code comment html form class 2018-10-26 20:12:46 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
277655b911 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 13:31:31 +02:00
John BOTELLA
fccea99e23 FIX translation in select unit form 2018-10-24 10:23:27 +02:00
Laurent Destailleur
83dacf6290 Merge pull request #9845 from frederic34/patch-22 
remove deprecated form_confirm
 2018-10-24 02:06:54 +02:00
atm-john
82f40fb4b9 NEW hidden conf to search by supplier ref 2018-10-23 23:21:30 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00