Commit Graph

50296 Commits

Author SHA1 Message Date
Alexis Algoud
8221817087 NEW add an option to use standard ISO location for bill in crabe model
For electronic sending solutions, it could be required
2015-11-05 16:17:09 +01:00
Laurent Destailleur
1927f47eaa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-05 13:43:33 +01:00
Laurent Destailleur
d2fa580f5d The code generator can generate a list.php page with all feature
immediatly working (sort, extrafields, hooks, select fields to show...)
2015-11-05 13:43:22 +01:00
Juanjo Menent
a9aca80f8d Merge pull request #3891 from grandoc/develop
[Qual] Fix : TODO:translate
2015-11-05 13:05:52 +01:00
philippe grand
b9c0cd316f [Qual] Fix : TODO:translate 2015-11-05 11:11:51 +01:00
Laurent Destailleur
41ccfc411a Better error message 2015-11-05 10:11:39 +01:00
Laurent Destailleur
fa413fea76 FIX #3813 2015-11-05 03:12:57 +01:00
Laurent Destailleur
a612289136 FIX Storing and deleting files on emailing was done at wrong place 2015-11-05 03:02:31 +01:00
Laurent Destailleur
1f4481a6b0 Merge pull request #3172 from atm-maxime/new_creditnote
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
2015-11-05 02:45:15 +01:00
Laurent Destailleur
7a5a5459cd Merge pull request #3888 from olsesacl/develop-hook-origin
When you create a "commande" from a "propal" lost $object->origin and  $object->origin_id in hook
2015-11-05 02:39:22 +01:00
Laurent Destailleur
e12c8fea79 Merge pull request #3885 from GPCsolutions/dolibarr-3870
Fix #3870 Missing translation
2015-11-05 02:32:48 +01:00
Laurent Destailleur
11b7d8a44c Merge pull request #3873 from frederic34/escpos
Escpos Receipt printer
2015-11-05 02:18:09 +01:00
Laurent Destailleur
bd96d2f5b1 Merge pull request #3869 from atm-alexis/3.9_FIX_hook_for_PDF
FIX all PDF hook must be in addreplace type
2015-11-05 02:16:49 +01:00
Laurent Destailleur
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
2015-11-05 01:50:30 +01:00
Laurent Destailleur
f3421bcf6d Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-05 01:13:23 +01:00
Laurent Destailleur
77371af35a FIX #3661 Margin is not selected correctly when adding a product 2015-11-05 01:08:30 +01:00
Sergio Sanchis Climent
f6991dd3ec Moving new fields at the end 2015-11-04 23:18:28 +01:00
frederic34
644a104d5f start to parse template 2015-11-04 23:14:50 +01:00
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
frederic34
ece9f68e0c wip 2015-11-04 20:02:04 +01:00
Raphaël Doursenaud
23a5c303dd Fix #3870 Missing translation 2015-11-04 19:56:12 +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
09f3cd6f1d Fix class cant be abstract 2015-11-04 16:43:24 +01:00
Laurent Destailleur
497bc91493 Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 2015-11-04 16:22:09 +01:00
Laurent Destailleur
0b4a1b827a Update demo database 2015-11-04 16:21:44 +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
826cc6db1b Repair old deprecated data 2015-11-04 09:54:13 +01:00
frederic34
614f9c8e98 wip 2015-11-03 23:26:07 +01:00
frederic34
4a67a94704 wip template edit 2015-11-03 23:11:04 +01:00
frederic34
5c725aceb8 sql 2015-11-03 22:12:03 +01:00
frederic34
d362d889f6 wip 2015-11-03 20:50:01 +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
Alexis Algoud
e3a42a78f2 FIX all PDF hook must be in addreplace type, not return value to work as expected 2015-11-03 15:14:42 +01:00
Laurent Destailleur
df4f09e72f FIX #3240 2015-11-03 14:02:36 +01:00
Laurent Destailleur
74be7bf334 FIX Filter in customer price per product of a thirdparty returned error 2015-11-03 11:40:06 +01:00
Laurent Destailleur
ea0bf44670 The ckecksum file should not be into sources. Only into packages. 2015-11-03 09:43:39 +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
Frédéric FRANCE
e7ced32245 Fix Can't edit DictionaryRevenueStamp 2015-11-02 20:08:33 +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