lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,393 Commits 43 Branches 150 Tags 886 MiB
6da82762f2
Commit Graph

56393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
c67fa41298 FIX : Translate group perms as it is done into user perms 2016-06-23 16:29:06 +02:00
florian HENRY
b43d4bba68 NEW : Add __SHIPPINGTRACKNUM__, __SHIPPINGTRACKNUMURL__ into shipping 
mail template
 2016-06-23 11:31:15 +02:00
Frédéric FRANCE
3690d11ca2 Update pdf.lib.php 2016-06-23 10:48:52 +02:00
Laurent Destailleur
d0f03d9ff6 Merge pull request #5376 from atm-florian/develop 
FIX php warning method declaration
 2016-06-23 10:02:13 +02:00
Laurent Destailleur
7f0ed90652 Merge pull request #5385 from simnandez/3.9 
FIX: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
 2016-06-23 10:01:34 +02:00
Laurent Destailleur
0662be0638 Merge pull request #5381 from grandoc/develop 
internationalization of code comment
 2016-06-23 10:01:00 +02:00
Laurent Destailleur
6cedec2d63 Merge pull request #5384 from frederic34/patch-8 
Update mysqli.class.php
 2016-06-23 09:57:36 +02:00
Laurent Destailleur
4a408e76e7 Fix download of mass generated files. 2016-06-22 21:06:08 +02:00
Laurent Destailleur
00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/imports/import.php
	htdocs/includes/odtphp/odf.php
	htdocs/product/stock/product.php
	htdocs/projet/list.php
 2016-06-22 20:22:22 +02:00
Laurent Destailleur
7f0062cb4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-22 20:09:31 +02:00
Laurent Destailleur
7fbbf7e8f0 Fix translation missing 2016-06-22 20:09:20 +02:00
Laurent Destailleur
f514400d87 FIX a case of corrupted ODT by Word that insert <text:s> when it should 
not.
 2016-06-22 20:08:29 +02:00
Juanjo Menent
0d62bd704e Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated 2016-06-22 18:59:51 +02:00
Laurent Destailleur
7ea16ac3fa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/theme/md/style.css.php
 2016-06-22 15:31:56 +02:00
Laurent Destailleur
f72ff5ac93 FIX Responsive errors due to boxes 2016-06-22 15:23:48 +02:00
fappels
2d8119b17b Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2016-06-22 13:47:10 +02:00
florian HENRY
dfba0638ab continue accoutancy and PG SQL compatibility 2016-06-22 11:28:21 +02:00
Xebax
e12e1980fc REST API: Add comments in the @deprecated tags. 2016-06-22 10:43:35 +02:00
Xebax
70ba8ec78d REST API: Bring back the existing API (for backward compatibility). 
Bring back the existing API and mark all the operations as deprecated.
Both the existing and the new API are documented and browsable with the
Restler API Explorer. The existing API appears under "root".
 2016-06-22 10:08:54 +02:00
Frédéric FRANCE
375ce04076 Update mysqli.class.php 2016-06-22 09:53:02 +02:00
florian HENRY
e897700bb2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2016-06-22 08:41:35 +02:00
Xebax
9e9e224c46 REST API: fix deleting a product/service. 
The global variable $user must be set before calling the
Product::delete() method else the check of permissions fails.
 2016-06-21 23:08:22 +02:00
Xebax
4a0d554986 Revert "REST API: fix deleting a product/service." 
This reverts commit d7c8a466b1.
 2016-06-21 22:54:38 +02:00
philippe grand
cc4fe87e13 internationalization of code comment 2016-06-21 17:00:52 +02:00
Laurent Destailleur
52f414ad73 Fix selection of visible fields on customer and supplier lists. Filters 
are ok now. Order of list of fields in selection is same than in output
array.
 2016-06-21 15:16:33 +02:00
Laurent Destailleur
b953e8f364 Minor fix 2016-06-21 12:15:41 +02:00
Laurent Destailleur
73fb7b2615 Fix phpunit regression. phpunit test on ws invoice is cleaner. 2016-06-21 01:07:44 +02:00
Xebax
3cac54741d REST API: fix the index() method in Categories. 
In the Categories class, set all the parameters of the index() method as
optional to make this method compatible with the one of the parent
class, DolibarrApi.
 2016-06-20 17:56:33 +02:00
Xebax
388839296e REST API: update the URLs in RestAPIUserTest.php. 2016-06-20 17:56:33 +02:00
Xebax
3b662d6ed8 REST API: improve the API to get/add categories for an item. 
Move the GET /xxx/{id}/categories requests to the corresponding classes
(Contacts, Products, Thirdparties).
Move the addCustomerCategory() method to the Thirdparties class. Use the
POST verb for the request instead of GET because the request modifies
the state of the server.
 2016-06-20 17:56:33 +02:00
Xebax
8d86b8b37d REST API: fix the definition of /orders/{id}/validate. 2016-06-20 17:56:33 +02:00
Xebax
ce6d7046be REST API: remove getByCategory() from Products 
because the same feature is available with GET /products/.
 2016-06-20 17:56:33 +02:00
Xebax
9a509dd0ee REST API: add the 'category' filter in /products/ 
and fix the 'to_sell' and 'to_buy' filters.
 2016-06-20 17:56:33 +02:00
Xebax
6d67303501 REST API: move the definition of /contacts/{id}/createUser 
from api_users.class.php to api_contacts.class.php.
 2016-06-20 17:56:33 +02:00
Xebax
d7c8a466b1 REST API: fix deleting a product/service. 
Add a User parameter to the Product::delete() method to explicitly set
the user that performs the action instead of using a global variable.
In the calls to Product::delete() with a fetched object, remove the
deprecated parameter $id.
 2016-06-20 17:56:33 +02:00
Xebax
58c25ff665 REST API: fix the error 500 when updating a product. 2016-06-20 17:56:33 +02:00
Xebax
9f526c512d REST API: sort the classes before adding them to Restler. 
The Restler API Explorer shows the classes in the order they are added
and it's a mess if they are not sorted.
 2016-06-20 17:56:33 +02:00
Xebax
f6eac2b643 REST API: replace the home made API explorer by the Restler API Explorer. 2016-06-20 17:56:33 +02:00
Xebax
5ea526c29e REST API: update the API to have /login and /status. 
Replace the GenericApi class by two classes, Login and Status, else the
endpoints would be /generic/login and /generic/status.
 2016-06-20 17:56:33 +02:00
Xebax
04778f932e REST API: replace the /thirdparty/ API by /thirdparties/. 
Remove several /thirdparty/list/xxx endpoints because they are redundant
with the /thirdparties/ endpoint whith the 'mode' filter.
Remove the customer/byemail/{email} endpoint because it is redundant
with the /thirdparties/ endpoint whith the 'email' filter.
Remove all the /customer/ endpoints because they do the same thing as
the corresponding /thirdparty/ endpoints.
 2016-06-20 17:56:33 +02:00
Xebax
571f6b8a26 REST API: replace the /order/ API by /orders/. 
Remove the /thirdparty/{socid}/order/list endpoint because it is
redundant with the /orders/ endpoint whith the 'societe' filter.
 2016-06-20 17:56:33 +02:00
Xebax
f03d6e1bed REST API: replace the /product/ API by /products/. 
Added some FIXME:
 - the put() method does its job but the API returns an error 500
 - delete() does not work.
 2016-06-20 17:56:33 +02:00
Xebax
8cf0bceadd REST API: replace the /invoice/ API by /invoices/. 
Rename the 'mode' parameter to 'status' in GET /invoices.
Fix the error handling in DELETE /invoices/{id}.
 2016-06-20 17:56:33 +02:00
Xebax
db77efc067 REST API: replace the /category/ API by /categories/. 
Remove several /category/list/xxx endpoints because they are redundant
with the /categories/ endpoint whith the 'type' filter.
 2016-06-20 17:56:33 +02:00
Xebax
396d31e18e REST API: begin the refactoring. 
Simplify the code that looks for the API classes and replace the
/contact/ and /user/ APIs by /contacts/ and /users/.
 2016-06-20 17:56:33 +02:00
Xebax
d6b9eb1a85 REST API: enable the Restler API Explorer. 2016-06-20 17:56:33 +02:00
florian HENRY
c34ef410e8 FIX php warning method declaration 2016-06-20 15:50:00 +02:00
Laurent Destailleur
6317cb53f2 FIX Merge of 2 thirdparties when there is one common tag. 2016-06-20 15:42:16 +02:00
Laurent Destailleur
b62be8dd0b Fix: Test table llx_expedition to allow delete of thirdparty 2016-06-20 14:17:17 +02:00
Laurent Destailleur
195fcc5653 Minor fixes 2016-06-20 11:43:53 +02:00