Juanjo Menent
33f98a4433
Merge pull request #2776 from aspangaro/develop-accountancy_patch1
...
Accountancy: add a button to purge search criteria on list
2015-05-06 20:53:46 +02:00
Juanjo Menent
ea95a461e2
Fix: Make propal pdf "azur" compatible with the two products images
...
storage system on use MAIN_GENERATE_PROPOSALS_WITH_PICTURE
2015-05-06 17:17:41 +02:00
Regis Houssin
4f8c485914
Fix: use global $object instead parameter
2015-05-06 16:46:12 +02:00
Regis Houssin
179309710c
Fix: use global $object instead parameter
2015-05-06 16:44:47 +02:00
Laurent Destailleur
e6e263d13f
Add field to manage reccuring events
2015-05-06 16:44:41 +02:00
Laurent Destailleur
8efe0143f9
FIX Adding 5 more choice link into survey module was not working with
...
chrome
2015-05-06 16:37:04 +02:00
Laurent Destailleur
45f36514ec
Add ansible example tools
2015-05-06 16:31:40 +02:00
Maxime Kohlhaas
42455f771a
Missing comments
2015-05-06 12:43:41 +02:00
Maxime Kohlhaas
d2603d5308
Fix : shipment was not considered as billed after classifybilled function
2015-05-06 12:39:10 +02:00
Maxime Kohlhaas
b203263e91
Fix : shipment PDF was not using generation params
2015-05-06 12:16:36 +02:00
jfefe
e5f0ab9324
Missing required class
2015-05-06 01:39:28 +02:00
jfefe
d62d7a2fc7
PHPCS again
2015-05-06 01:25:56 +02:00
jfefe
24bf614061
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-05-06 01:00:11 +02:00
jfefe
dbb9449ee7
Fix PHPCS
2015-05-06 00:55:42 +02:00
Laurent Destailleur
db63a9783e
More responsive design
2015-05-06 00:29:39 +02:00
aspangaro
10a895f1bd
Accountancy: add a button to purge search criteria on list
2015-05-05 22:36:48 +02:00
Laurent Destailleur
4ce4529cd5
Revert "Remove useless variables for common object"
...
This reverts commit 82682dfc66 .
2015-05-05 22:09:58 +02:00
Laurent Destailleur
a4675010ac
Fix label
2015-05-05 22:08:53 +02:00
Laurent Destailleur
0410f29e81
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-05 21:59:06 +02:00
Laurent Destailleur
b0baed83fc
Prepare for email tracking
2015-05-05 21:50:48 +02:00
aspangaro
d06f1db7d0
Merge remote-tracking branch 'Upstream/develop' into develop-pagination
2015-05-05 21:42:34 +02:00
aspangaro
f092be58c8
New: Add visual pagination for use on tablet
2015-05-05 21:41:08 +02:00
Arnaud Aujon Chevallier
da8aaea343
Merge remote branch 'upstream/3.7' into 3.7-webservices-fix
2015-05-05 21:37:50 +02:00
Arnaud Aujon Chevallier
4fd8d6c05a
fix typo
2015-05-05 21:37:10 +02:00
Raphaël Doursenaud
7d08c95fcc
Updated unit test to reflect dol_delete_file changes
2015-05-05 21:15:54 +02:00
Raphaël Doursenaud
b91d1fa0ca
dol_delete_files(): removed unused variables
2015-05-05 21:15:53 +02:00
Raphaël Doursenaud
7b542731a1
Made test pessimistic by default
...
The test result was wrong if, for example, the path was wrong.
The unlink() function being never called, it returned the default true value even if it didn't
remove a file.
2015-05-05 21:15:53 +02:00
Juanjo Menent
dc01de8072
Merge pull request #2765 from aternatik/common_properties
...
Remove useless variables for common object
2015-05-05 20:27:52 +02:00
Juanjo Menent
f6d2320c34
Merge pull request #2756 from aternatik/fix_label_product
...
FIX : remove deprecated property 'libelle' on product object
2015-05-05 20:25:08 +02:00
Juanjo Menent
65d736cb68
Merge pull request #2766 from aternatik/fix_product_cat
...
Fix : missing link to category into product card.
2015-05-05 20:17:17 +02:00
Juanjo Menent
75fe8af5dc
Merge pull request #2770 from GPCsolutions/dolibarr-2769
...
Added missing translation of categories' "Translation" tab
2015-05-05 20:04:13 +02:00
Laurent Destailleur
f97d81701b
Add an exit to avoid to have apache hangs.
2015-05-05 13:46:28 +02:00
jfefe
3b1f6e8a5a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
2015-05-05 12:56:10 +02:00
Laurent Destailleur
467ee7b771
Fix error into export filter step
...
Conflicts:
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modContrat.class.php
htdocs/core/modules/modFournisseur.class.php
2015-05-05 12:45:38 +02:00
jfefe
5f62d2b13e
Add API class for invoice
2015-05-05 12:42:57 +02:00
jfefe
db5a2bacd1
Bad sort field
2015-05-05 12:42:56 +02:00
jfefe
638c534211
Modify API explorer settings to memorize api key
2015-05-05 12:42:56 +02:00
jfefe
fd077db1b7
NEW : script to build API class from existing class
2015-05-05 12:42:56 +02:00
jfefe
289b847eb4
Add API class for orders
2015-05-05 12:42:56 +02:00
jfefe
0012cd8131
Fix API category class
2015-05-05 12:42:56 +02:00
jfefe
967e8c66a9
Add method to get each type of category with a specific uri
2015-05-05 12:42:55 +02:00
jfefe
0e4a06799d
Add API class for categories
2015-05-05 12:42:55 +02:00
Laurent Destailleur
c665bfa3ee
Fix error into export filter step
2015-05-05 12:39:27 +02:00
Raphaël Doursenaud
2ff0cebbf7
Added missing translation of categories' "Translation" tab
...
Fix #2769
2015-05-05 11:24:04 +02:00
Laurent Destailleur
409e74facd
Missing translation
2015-05-05 11:10:13 +02:00
Laurent Destailleur
4d34f473f6
Won another space line
2015-05-05 11:07:28 +02:00
Arnaud Aujon Chevallier
d020c4133a
webservice_order : return all necessary fields
2015-05-05 10:26:05 +02:00
Laurent Destailleur
896d95cf1c
Add doc to build when ony changelog change
2015-05-05 10:23:47 +02:00
Arnaud Aujon Chevallier
8b753dc743
fix typo
2015-05-05 10:05:13 +02:00
Laurent Destailleur
1e8b148e4b
Work on tracking id into emails
2015-05-05 04:10:42 +02:00