Commit Graph

56393 Commits

Author SHA1 Message Date
aspangaro
bac23ce422 Merge remote-tracking branch 'Upstream/develop' into 5.0-p15
Conflicts:
	htdocs/commande/class/api_orders.class.php
2016-09-25 05:45:58 +02:00
Laurent Destailleur
a7db09c020 Fix phpcs 2016-09-24 23:06:09 +02:00
aspangaro
8dc6a8fd1d Correct presentation 2016-09-24 14:47:51 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
2016-09-24 06:48:40 +02:00
Laurent Destailleur
3eaec4d4b8 Uniformise fields in tables 2016-09-23 10:55:44 +02:00
florian HENRY
984a56adc5 FIX : #5776 2016-09-23 10:51:31 +02:00
Laurent Destailleur
dc45776d31 FIX Date visible on project overview 2016-09-23 10:32:19 +02:00
Laurent Destailleur
c6ef3778b7 FIX Creation of donation should go back on card after creation 2016-09-23 09:55:49 +02:00
Laurent Destailleur
039bf4aae9 Fix date 2016-09-22 19:16:29 +02:00
Laurent Destailleur
47b1f79030 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-22 18:48:34 +02:00
Laurent Destailleur
1642d7c23b Trans 2016-09-22 18:48:17 +02:00
Laurent Destailleur
8791a9f5f1 Fix date on Purchase Orders 2016-09-22 18:47:31 +02:00
gauthier
7ad2fda289 NEW : Reopen a paid bill is a user right 2016-09-22 15:06:39 +02:00
Laurent Destailleur
f1166f1898 Fix warning 2016-09-22 13:00:02 +02:00
Laurent Destailleur
d598e206cd Fix warning 2016-09-22 12:56:48 +02:00
Laurent Destailleur
35dd492d19 NEW Add REST api for commercial proposals 2016-09-22 12:53:44 +02:00
Laurent Destailleur
8fa8bc7d34 Rename table for a better understanding 2016-09-22 11:39:43 +02:00
Laurent Destailleur
145f70a341 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-22 11:36:39 +02:00
Laurent Destailleur
4ec7bcd23e Rename api class to solve conflict 2016-09-22 11:36:16 +02:00
Laurent Destailleur
11533fc98d Removed a old hidden problematic feature never used in Dolibarr. If an
external module need datatable, the module must provide all lib it needs
and manage version problems with other dolibarr components
2016-09-22 11:31:15 +02:00
Laurent Destailleur
619b65e0b6 Fix warning 2016-09-22 11:06:39 +02:00
Laurent Destailleur
448acbf7a1 Merge pull request #5766 from atm-florian/4.0
fix customer accountancy lines ventilaled bad href link
2016-09-22 09:15:52 +02:00
Laurent Destailleur
b2271bced1 Merge pull request #5768 from aspangaro/4.0-p49
Fix: Accountancy - Problem on Cegid Export Format & presentation
2016-09-22 09:15:19 +02:00
Laurent Destailleur
cef02a9766 Merge pull request #5764 from atm-gauthier/NEW_add_limit_stock_product_by_warehouse
New add limit stock product by warehouse
2016-09-22 09:15:05 +02:00
Laurent Destailleur
f9f95dec42 Merge pull request #5765 from hregis/3.9_bug
Fix: Using $this when not in object context
2016-09-22 09:10:56 +02:00
Laurent Destailleur
37a0df3277 Merge pull request #5761 from abilbaotm/patch-1
Fix Syntax error, unrecognized expression: input.remain]
2016-09-22 09:10:25 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/facture.php
2016-09-21 18:38:30 +02:00
Laurent Destailleur
9c12444a03 Fix size of warehouse and height of confirm box 2016-09-21 18:20:18 +02:00
Laurent Destailleur
494d4783a7 Fix tab works when editing prices 2016-09-21 18:13:27 +02:00
gauthier
2556e59ccf NEW : auto delete product_stock_entrepot elements when we drop a product or a warehouse 2016-09-21 16:21:23 +02:00
gauthier
6034b21746 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse 2016-09-21 12:17:38 +02:00
BENKE Charlie
f826013cb3 Update fournisseur.facture.class.php 2016-09-21 12:07:43 +02:00
BENKE Charlie
c713eb987e Update fournisseur.facture.class.php 2016-09-21 12:06:39 +02:00
BENKE Charlie
cb736f5b93 Add update_total function (like on other element)
the goal is to have and use the same function in all the native standard element (proposal, order, bill / customer and fournish)
2016-09-21 12:05:18 +02:00
gauthier
576ef9e541 FIX : sql syntax for travis test 2016-09-21 09:31:40 +02:00
Laurent Destailleur
39c4feaef7 Enhancement for usage on smartphone 2016-09-21 03:54:54 +02:00
Laurent Destailleur
d759296c02 Fix color of amount 2016-09-21 01:39:05 +02:00
Laurent Destailleur
1c15539bb4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-21 01:27:25 +02:00
Laurent Destailleur
2c42697cae Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-21 01:26:22 +02:00
Laurent Destailleur
f1bb69eecf Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-21 01:26:03 +02:00
Laurent Destailleur
133657a8c7 Uniformize code 2016-09-21 01:25:34 +02:00
Laurent Destailleur
b5dad8cfbf Better responsive 2016-09-21 00:29:19 +02:00
aspangaro
9a3305abf9 Fix: Accountancy - Problem on Cegid Export Format & presentation 2016-09-20 21:12:28 +02:00
florian HENRY
278bef8767 fix customer accountancy lines ventilaled bad href link 2016-09-20 16:48:32 +02:00
gauthier
b95b84a665 FIX : doc comment for parameter $fk_product 2016-09-20 15:31:55 +02:00
gauthier
dc15eb079a FIX : keep params when we search or skip to another page 2016-09-20 14:38:05 +02:00
Laurent Destailleur
79ddc2458d Better center of left, center and right part of titles. 2016-09-20 12:51:09 +02:00
Regis Houssin
937f1fd3ee Fix: Using $this when not in object context 2016-09-20 12:19:17 +02:00
gauthier
d508d44fef NEW : migration script from 4.0.0 to 5.0.0 and langs 2016-09-20 12:10:25 +02:00