Commit Graph

50256 Commits

Author SHA1 Message Date
Sergio Sanchis Climent
eba0fa1b96 When you create an "commande" from a "propal" lost $object->origin and $object->origin_id in hook 2015-11-04 22:38:45 +01:00
Laurent Destailleur
a7795f25fc Fix Must make a difference between a buying/cost price == '' (not
provided) and buying/cost price = '0'. We must use default value only if
value is '' and not if forced to '0'.
2015-11-04 17:51:15 +01:00
Laurent Destailleur
832afa139a Update skeleton to generate a list page and a card page. 2015-11-04 16:13:50 +01:00
Laurent Destailleur
f15425be52 Include the link "Back to list" on banner of all user tabs. 2015-11-04 15:45:35 +01:00
Laurent Destailleur
6a9342f5a3 Move default application name into one place (as a constant) 2015-11-04 14:54:17 +01:00
Laurent Destailleur
3726b127a1 Remove duplicated code or useless code 2015-11-04 14:44:11 +01:00
Laurent Destailleur
81f0b516b9 Prepare module opensurvey for 'Form' type. 2015-11-04 11:08:46 +01:00
Laurent Destailleur
d5b77bdc5f Fix parameters are set at a better place 2015-11-03 19:51:07 +01:00
Laurent Destailleur
0d4c5c4452 Fix missing $db->jdate 2015-11-03 15:33:45 +01:00
Laurent Destailleur
3ba194f638 NEW Can select fields to show into the contact list 2015-11-03 15:32:16 +01:00
Laurent Destailleur
12e11da6b4 Use better field 2015-11-02 21:44:52 +01:00
Laurent Destailleur
cd68ea9d0f Fix: We must use external URL for OAuth. 2015-11-02 21:42:11 +01:00
Laurent Destailleur
1bcda200e3 A module to setup OAuth. OK, but what to do once setup of a client
id/secret is done ?
2015-11-02 20:48:27 +01:00
Laurent Destailleur
563a020595 NEW Free text for cheque deposit receipt can be HTML content. 2015-11-02 20:35:33 +01:00
Laurent Destailleur
ffe1284a85 Merge pull request #3840 from frederic34/printgcp
Printing with Google Cloud Print
2015-11-02 20:09:13 +01:00
Laurent Destailleur
7b3828b68f Merge pull request #3861 from frederic34/patch-7
Fix Can't edit DictionaryRevenueStamp
2015-11-02 20:07:09 +01:00
Laurent Destailleur
e9a0e10520 Remove travis log 2015-11-02 20:04:58 +01:00
Laurent Destailleur
b8ffa56497 Fix #3857 2015-11-02 19:49:00 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
d8796e4cc7 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/product/stats/commande.php
	htdocs/product/stats/commande_fournisseur.php
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
	htdocs/product/stats/propal.php
2015-11-02 19:25:51 +01:00
Laurent Destailleur
38ed83d05f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/core/lib/company.lib.php
2015-11-02 19:19:05 +01:00
Laurent Destailleur
958c3851d7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-02 19:17:32 +01:00
Laurent Destailleur
055fe5e275 FIX #3786 Translation of select box. 2015-11-02 19:17:22 +01:00
Frédéric FRANCE
ccb69d313c Fix Can't edit DictionaryRevenueStamp 2015-11-02 18:18:00 +01:00
Laurent Destailleur
bb26e1c195 Merge pull request #3860 from frederic34/patch-5
Update resource.lang
2015-11-02 18:06:31 +01:00
Laurent Destailleur
67a2f6ee91 Merge pull request #3854 from fmarcet/3.8
FIX: Send emails to contacts who should not receive emails
2015-11-02 18:03:59 +01:00
Laurent Destailleur
2dab183240 Merge pull request #3858 from fappels/3.8
Fix always first warehouse in stock list lotserial
2015-11-02 17:59:33 +01:00
Laurent Destailleur
d3837ffaaa Merge pull request #3859 from frederic34/patch-3
Typo
2015-11-02 17:57:26 +01:00
Laurent Destailleur
f928062e2b FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO 2015-11-02 17:56:32 +01:00
Frédéric FRANCE
76c89884ba Update resource.lang 2015-11-02 17:32:02 +01:00
Frédéric FRANCE
ebf6493987 Typo 2015-11-02 17:31:03 +01:00
fappels
d714d32424 Fix always first warehouse in reassortlot 2015-11-02 16:37:51 +01:00
fappels
5246557493 Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8 2015-11-02 16:34:25 +01:00
Laurent Destailleur
3ba97627ff FIX Default thirdparty when cloning invoice was not set. 2015-11-02 15:50:03 +01:00
Laurent Destailleur
85af140420 More complete example of odt template for invoices 2015-11-02 15:46:27 +01:00
Laurent Destailleur
e12a38d584 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-02 15:44:57 +01:00
Laurent Destailleur
d0d4c5e7f8 NEW The conditional IF into ODT templates works also on not defined var
so we can show data only if defined. Close #3819
2015-11-02 15:44:47 +01:00
Laurent Destailleur
c06c2d0464 FIX #3841 creation of a task completed has not status set to finished by
default
2015-11-02 14:21:45 +01:00
Laurent Destailleur
89f23b2129 Merge pull request #3856 from frederic34/patch-17
Avoid refresh to see update in supplier card
2015-11-02 14:01:02 +01:00
Frédéric FRANCE
7b8a33adfe Update commonobject.class.php 2015-11-02 13:20:51 +01:00
Laurent Destailleur
c119859696 NEW The quick search box on left menu can also search into expense
reports.
2015-11-02 13:14:46 +01:00
fmarcet
3c5903f75a FIX: Contacts are not added to the list with the status "no contact" 2015-11-02 11:52:58 +01:00
fmarcet
ba4f306c83 FIX: Avoid changing the state to a thirdparty who shouldn't be
contacted anymore
2015-11-02 11:52:58 +01:00
Laurent Destailleur
269fb87342 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-02 11:46:12 +01:00
Laurent Destailleur
20a1863866 FIX IF autocomplete was set on thirdparty list, it was not possible to
open list of extrafields.
2015-11-02 11:45:59 +01:00
frederic34
9149032a03 Merge remote branch 'upstream/develop' into printgcp
Conflicts:
	htdocs/core/actions_printing.inc.php
2015-11-02 11:43:34 +01:00
Laurent Destailleur
250be086b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-02 11:36:39 +01:00
Laurent Destailleur
1ee9594e38 Merge pull request #3846 from frederic34/patch-21
Correction double translation which give bad html display
2015-11-02 11:29:04 +01:00
Laurent Destailleur
a9ddcc1a80 Merge pull request #3832 from frederic34/patch-16
NEW Add supplier order to the Direct Printing System
2015-11-02 11:27:00 +01:00
Laurent Destailleur
a14fee7296 Merge pull request #3852 from hregis/develop_origin
FIX add Mac OS detection and show it into OS information of user popup
2015-11-02 11:26:20 +01:00