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
jfefe
e698c3b64a
Fix into category edit page
...
Rename $nom into $label
Add missing html class to show description as required
2015-05-05 01:43:39 +02:00
jfefe
3d8f692355
Fix : missing link to category into product card.
2015-05-05 01:34:50 +02:00
jfefe
82682dfc66
Remove useless variables for common object
...
Fields name / civility / ... are nonsense for a lot of objects into Dolibarr.
They could be defined for each object instead of into the common object class.
This for the API which exposes a property civility for a category :\
2015-05-05 01:13:49 +02:00
Laurent Destailleur
2caf137ea0
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-05-04 22:05:21 +02:00
Laurent Destailleur
9b55bedf66
FIX bad calculation for stock value
2015-05-04 22:04:58 +02:00
Laurent Destailleur
c89c89c73e
Mutualise code and some fixes for stock management.
2015-05-04 22:02:54 +02:00
Laurent Destailleur
47e99d82a4
Fix css
2015-05-04 13:36:33 +02:00
Laurent Destailleur
f84ea6f960
Uniformize code of boxes
2015-05-04 13:10:45 +02:00
jfefe
a1cc47f81b
Missing rename product field libelle into label
2015-05-04 12:58:54 +02:00
Laurent Destailleur
e73526b29c
Fix prospect box must use the getNomUrl method
2015-05-04 12:42:45 +02:00
jfefe
3a1b7d6530
Missing renaming fields
2015-05-04 12:37:50 +02:00
jfefe
561d5e82c1
Rename libelle product field into label
2015-05-04 12:33:38 +02:00
Laurent Destailleur
90f78429ec
Fix regression after renaming field fk_soc
2015-05-04 12:29:26 +02:00
Laurent Destailleur
4f4ebfaed3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/printipp/admin/printipp.php
2015-05-04 12:09:39 +02:00
Laurent Destailleur
a18e3c7813
Fix correct id of core modules
2015-05-04 12:02:09 +02:00
jean
659570a6ab
add a script for migrating pictures of products
2015-05-04 11:56:02 +02:00
Laurent Destailleur
ac4bd7d441
Uniformize code
2015-05-04 11:41:30 +02:00
Arnaud Aujon
d27934419c
fix log
2015-05-04 11:36:53 +02:00
Arnaud Aujon
d8027bd71d
add thirdparty_id to get invoice
2015-05-04 11:36:40 +02:00
Laurent Destailleur
b554d81314
Better translation
2015-05-04 10:47:26 +02:00
Arnaud Aujon
ef08283bbd
Merge branch '3.7-webservices-fix' of https://github.com/aaujon/dolibarr into 3.7-webservices-fix
2015-05-04 10:36:17 +02:00
Laurent Destailleur
89c9996b22
Fix translation of status
2015-05-04 09:50:49 +02:00
fmarcet
077a9c6510
FIX: Bug on order and supplier invoice numeration mask when use supplier
...
code
2015-05-04 09:22:55 +02:00
jfefe
7e0357dcf9
FIX : remove deprecated property 'libelle' on product object
2015-05-04 03:03:24 +02:00