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
jfefe
5c7f7f6d6e
Add API readme
2015-05-04 02:32:24 +02:00
jfefe
a732b4d69b
Missing value in PHPDoc tag for specify url method (in skeleton file)
2015-05-04 02:29:24 +02:00
jfefe
18def27eb6
Change API route for thirdparties lists
...
Use /thirdparty/list instead of /thirdparties/
2015-05-04 01:31:23 +02:00
jfefe
cd37d3eb11
Add API class for product
2015-05-04 01:17:41 +02:00
jfefe
0003a14470
Update skeleton API class
2015-05-04 00:35:09 +02:00
jfefe
0673e3a1f1
Fix API lists method for thirdparty and contact
2015-05-04 00:33:44 +02:00
jfefe
53f480708f
Merge branch 'develop' into api_restler
2015-05-03 23:43:13 +02:00
Laurent Destailleur
877511717b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-03 21:35:09 +02:00
Laurent Destailleur
0ba2ae6d32
Some fix in css
2015-05-03 21:31:09 +02:00
Laurent Destailleur
4f9af75afa
Merge pull request #2723 from ndrosis/patch-17
...
hide password
2015-05-03 21:20:31 +02:00
Laurent Destailleur
8a7728f193
Merge pull request #2752 from fappels/develop-tcpdfbarcode
...
NEW add tcpdf barcode generator and printing, add 2d Datamatrix and QRcode CLOSE #2655
2015-05-03 21:19:01 +02:00
Laurent Destailleur
a566ec3ace
Merge pull request #2755 from aternatik/company_delete
...
Modify thirdparty delete() method to pass user object as an argument.
2015-05-03 21:18:38 +02:00
Laurent Destailleur
8b85d17a51
Merge pull request #2753 from aspangaro/develop-ER_badge
...
Review ER: Add filter on amounts & correct search mode who doesn't work & typo
2015-05-03 21:17:18 +02:00
Laurent Destailleur
333a29683c
uniformize look
2015-05-03 21:15:08 +02:00
jfefe
8fd03fa87e
Add API class for contacts
2015-05-03 21:12:18 +02:00
jfefe
5fa5b51d2b
Add API class skeleton for developers.
2015-05-03 20:15:06 +02:00
Laurent Destailleur
c485b1fe30
Fix When generation of doc is required and generator not provided, we
...
take first entry found.
2015-05-03 20:07:16 +02:00
jfefe
60d6cc5806
Modify search of API classes for module
...
A module can now bring several API classes.
By example, thirdparty module can have api_thirdparty.class.php for thirdparty and api_contact.class.php for contacts.
Classes must be named <Object>API (ie ThirdpartyApi or ContactApi)
2015-05-03 19:43:49 +02:00
jfefe
80b832e90c
Add API methods to retrieve customers, prospects and others
2015-05-03 19:13:14 +02:00
jfefe
0d14cb8709
Modify thirdparty delete() method to pass user object as an argument.
2015-05-03 18:44:42 +02:00
jfefe
a8ee123bb2
Add API methods to create, update and delete a thirdparty
2015-05-03 18:30:59 +02:00
jfefe
64d0a710f7
API tirdparties list
2015-05-03 16:59:47 +02:00
Laurent Destailleur
f0b10c14d7
NEW Add a new component to select categories/tags from the main edit
...
page of product. The dedicated tab is also removed.
2015-05-03 15:51:55 +02:00
Laurent Destailleur
984aca28c3
Sync translation
2015-05-03 15:37:15 +02:00
jfefe
2ea8c90fe2
Module descriptor for API module
2015-05-03 14:53:40 +02:00
jfefe
47c3724f3d
Verify API access by user to resource
...
API authentication mechanism is supposed to be working with internal or external users
2015-05-03 14:44:37 +02:00
