lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
63,822 Commits 43 Branches 150 Tags 886 MiB
33f6ba19da
Commit Graph

63822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
33f6ba19da
display weight volume in propal 2017-12-28 16:20:08 +01:00
Laurent Destailleur
77be56ff74
Merge pull request #7991 from defrance/patch-103 
Add project column on proposal list
 2017-12-28 13:03:03 +01:00
Laurent Destailleur
af8ebc616b
Update list.php 2017-12-28 13:02:26 +01:00
Laurent Destailleur
9ac99caffe
Merge pull request #7995 from frederic34/patch-1 
Update propal.class.php
 2017-12-28 12:51:44 +01:00
Laurent Destailleur
ce680af357 Fix field name and length (database portabilit) 2017-12-28 11:16:27 +01:00
Laurent Destailleur
6676178435 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/contrat/card.php
 2017-12-28 09:56:40 +01:00
Laurent Destailleur
bbcf70cf4e Remove spaces 2017-12-28 09:48:41 +01:00
Laurent Destailleur
70e75753f8
Merge pull request #7994 from fmarcet/6.0 
Fix: Missing include for Project class
 2017-12-28 08:48:41 +01:00
Laurent Destailleur
3ac413084f
Merge branch '6.0' into 6.0 2017-12-28 08:46:22 +01:00
Laurent Destailleur
836a94fab2
Merge pull request #7988 from OPEN-DSI/core_pdf_modele_propal_payment_mode_flag 
Fix PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE
 2017-12-28 07:18:57 +01:00
Laurent Destailleur
3d4e6c9169
Merge pull request #7987 from atm-arnaud/FIX_trans_product_stats 
FIX stats trad for customerinvoice
 2017-12-28 07:10:14 +01:00
Laurent Destailleur
56bc0dbd25
Merge pull request #7986 from atm-arnaud/FIX_contractline_trans_unactivate 
FIX trans unactivate on contractline
 2017-12-28 07:09:28 +01:00
Laurent Destailleur
31b5d9df52
Merge pull request #7985 from atm-arnaud/FIX_search_contact_list 
FIX search on contact list
 2017-12-28 07:07:47 +01:00
Laurent Destailleur
8476567dc6
Merge pull request #7981 from fappels/7.0_sendmail_trigger_error 
Fix action_sendmail.inc
 2017-12-28 07:01:02 +01:00
Laurent Destailleur
de305cb3b2
Merge pull request #7980 from hregis/6.0_bug2 
Fix: avoid php warning
 2017-12-28 06:53:09 +01:00
Laurent Destailleur
fcf42802a3 More example for website 2017-12-27 21:13:42 +01:00
Laurent Destailleur
5264aec853 Add js into export of website 2017-12-27 20:21:19 +01:00
Laurent Destailleur
8388858715 Fix filemanager 2017-12-27 20:17:08 +01:00
Laurent Destailleur
6f107e3fee Fix API to download/build doc 2017-12-27 15:48:20 +01:00
Frédéric FRANCE
80618d56ac
Update propal.class.php 2017-12-26 16:12:28 +01:00
Ferran Marcet
1c7b99d3dc Fix: Missing include for Project class 2017-12-26 12:13:35 +01:00
Laurent Destailleur
768cc19bbc Fix protection on tpl to avoid direct url call 2017-12-24 15:07:06 +01:00
Laurent Destailleur
07f1dd7dae Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-24 15:03:09 +01:00
Laurent Destailleur
644e8b5a05 Fix navigation on stock 2017-12-24 15:02:15 +01:00
Laurent Destailleur
fdac3078e2 Fix permissions 2017-12-24 14:42:51 +01:00
Laurent Destailleur
b70dd36ffa Better js comment 2017-12-24 12:16:48 +01:00
BENKE Charlene
df884e4080
Add project column on proposal list 
if project are not enabled we don't display it
 2017-12-23 18:37:08 +01:00
Laurent Destailleur
e6c7f9e69b Debug module inventory 2017-12-22 21:29:09 +01:00
Laurent Destailleur
57272dc5fe API to get list of available document is ok for invoice 
order, proposal, shipment
 2017-12-22 19:49:31 +01:00
Laurent Destailleur
f0c8b548f3 Fix bugs reported by scrutinizer 2017-12-22 14:24:31 +01:00
Laurent Destailleur
493669e986 Fix look and feel v7 2017-12-22 14:19:12 +01:00
Laurent Destailleur
e839c72109 Fix css 2017-12-22 14:05:49 +01:00
Laurent Destailleur
fb8326a9bb Css use roboto but files does not exists 2017-12-22 12:56:29 +01:00
Laurent Destailleur
3b54be5dac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/product/price.php
 2017-12-22 12:55:16 +01:00
Laurent Destailleur
2b056b0177 BUG Fix of old hidden feature price per quantity 2017-12-22 12:53:46 +01:00
Laurent Destailleur
ff245aa646 BUG Fix of old hidden feature price per quantity 2017-12-22 10:56:52 +01:00
Laurent Destailleur
d1cfbc2906 Code comment 2017-12-22 01:03:40 +01:00
Laurent Destailleur
207730bf63 Css 2017-12-22 00:22:33 +01:00
Laurent Destailleur
27a9a81f99 Fix link to contracts 2017-12-21 23:48:33 +01:00
KHELIFA
d069ccdb7f Core Modele PDF: Fix globale variable for hide payment mode with PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE 
- Fix hide payment condition for supplier proposal
 2017-12-21 16:58:37 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
Laurent Destailleur
6a96a9765f Transifex sync 2017-12-21 15:04:04 +01:00
Laurent Destailleur
eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
 2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960 FIX security vulnerability reported by ADLab of Venustech 2017-12-21 13:32:16 +01:00
Laurent Destailleur
62f895e2ec Fix: avoid infinite loop 2017-12-21 13:31:39 +01:00
Laurent Destailleur
4a5988accb FIX security vulnerability reported by ADLab of Venustech 2017-12-21 12:52:19 +01:00
arnaud
b1ce3fc5c8 FIX stats trad for customerinvoice 2017-12-21 12:12:50 +01:00
arnaud
4ba039d229 FIX trans unactivate on contractline 2017-12-21 12:07:29 +01:00
arnaud
ae7f8c3fe4 FIX search on contact list 2017-12-21 12:01:30 +01:00
Laurent Destailleur
54d7d85d90 Sync transifex 2017-12-21 11:47:35 +01:00