Commit Graph

57743 Commits

Author SHA1 Message Date
BENKE Charlie
3f236b1ebf FIX : $resaction not used in all case
Please integrate on next 5.0
2017-02-03 12:14:29 +01:00
Laurent Destailleur
53661e1e4f Merge pull request #6211 from GPCsolutions/optimizetranslate
[Qual] Optimize language file loading
2017-02-03 11:55:29 +01:00
Laurent Destailleur
9d3c774163 Merge pull request #6364 from atm-ph/new_trigger_in_expensereport_class
NEW add triggers for expensereport object
2017-02-03 11:46:59 +01:00
Laurent Destailleur
3dea950c24 Merge pull request #6355 from atm-ph/new_alternate_htmlid_select_project
New htmlid can be use instead of htmlname for select projects
2017-02-03 11:44:54 +01:00
Laurent Destailleur
bdca134e99 NEW Change to allow a specific numbering rule for invoice with POS
module.
2017-02-02 23:49:17 +01:00
Laurent Destailleur
a42ad74a37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 23:22:34 +01:00
Laurent Destailleur
b4c97e2279 Update pad files 2017-02-02 23:14:51 +01:00
atm-ph
ac20a1a874 Fix remove param htmlid in ajax_combobox 2017-02-02 20:47:45 +01:00
phf
f2fdee0ed2 New add trigger for expensereport object 2017-02-02 11:42:38 +01:00
Laurent Destailleur
64da0e77d5 Merge pull request #6358 from defrance/patch-71
FIX : fill fourn remise percent with select product mode
2017-02-02 02:27:35 +01:00
Laurent Destailleur
cd6f5fb8cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 02:26:09 +01:00
Laurent Destailleur
13f37b2cb9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 02:25:49 +01:00
Laurent Destailleur
f6144b9ecb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-02 02:24:57 +01:00
Laurent Destailleur
819edcf43a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-02 02:24:03 +01:00
Laurent Destailleur
09ebb1dcdc Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-02-02 02:23:58 +01:00
Laurent Destailleur
c657d193ec Fix translation 2017-02-02 02:23:33 +01:00
Laurent Destailleur
6b1e81fa1d Fix missing space 2017-02-02 02:22:01 +01:00
Laurent Destailleur
374bff5a5f Merge pull request #6362 from fappels/5.0_changelog
Update changelog for developer
2017-02-02 01:36:14 +01:00
Laurent Destailleur
672e81d466 Merge pull request #6352 from philippe-opendsi/develop
NEW Option to reload supplier order and invoice create  page
2017-02-02 01:23:53 +01:00
Laurent Destailleur
f31eaef0d9 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-02-02 01:21:58 +01:00
Laurent Destailleur
68a6a08a01 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-02-02 01:20:45 +01:00
Laurent Destailleur
797b68fc20 Merge pull request #6351 from atm-maxime/fix_banklink_expensereport
Fix : link to user in bank was wrong regarding expensereport payment
2017-02-02 01:18:04 +01:00
Laurent Destailleur
cfb317abdd Merge pull request #6348 from atm-arnaud/FIX_project_filter_supplier_order
FIX Supplier Order list filter by project
2017-02-02 01:14:04 +01:00
Laurent Destailleur
9d797f59a1 Merge pull request #6345 from marcosgdf/bug-4758
FIX #4758 PHP warning when installing to PostgreSQL with incorrect credentials
2017-02-02 01:09:23 +01:00
Laurent Destailleur
8f0ddf2b8c Merge pull request #6342 from simnandez/5.0
Fix #6314 Sorting balance error
2017-02-02 01:03:21 +01:00
Laurent Destailleur
4e43a815d1 Merge pull request #6359 from aspangaro/6.0-3
Fix : [FP17] Correct some problems on category accounting account page
2017-02-02 01:02:49 +01:00
Laurent Destailleur
f15295d4bc Merge pull request #6350 from aspangaro/6.0-chartofaccounts
New : [FP17] Accountancy - Add select field in list of accounts
2017-02-02 01:02:30 +01:00
Laurent Destailleur
b3d00fb01d Merge pull request #6356 from fappels/5.0_lot_qty_separation
Fix lot info separation on shipment docs
2017-02-02 01:01:11 +01:00
Laurent Destailleur
4f3a24afab Merge pull request #6340 from Oeris/5.0
New : Displays the expense report author accounting account
2017-02-02 00:59:57 +01:00
Laurent Destailleur
1785ef9957 Code comment 2017-02-02 00:59:07 +01:00
Laurent Destailleur
18f3e11c10 Merge pull request #6339 from atm-maxime/fix_numbering_display_error
Fix numbering was disaplying technical error instead of error message
2017-02-02 00:49:18 +01:00
Laurent Destailleur
c3fb559d3b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
9b37b52f45 Fix css 2017-02-01 20:55:30 +01:00
fappels
52b92995cc use method commande->availability 2017-02-01 19:49:52 +01:00
fappels
8b2d0064a3 Update changelog for developer 2017-02-01 16:51:42 +01:00
Laurent Destailleur
924a08a078 Fix code should use 5.0 framework 2017-02-01 16:24:40 +01:00
Laurent Destailleur
fbbf8cd8a4 Fix bad side effect of uniformizing a constant name. 2017-02-01 15:47:08 +01:00
Laurent Destailleur
d945a0de92 NEW Uniformize behaviour: Action to make order is an action button. 2017-02-01 14:59:51 +01:00
Laurent Destailleur
9a9b31c9c0 Fix cancel button + logic to close project when setting opp to WON/LOST. 2017-02-01 13:25:16 +01:00
aspangaro
2ce4ba99fe Fix : [FP17] Correct some fix on category accounting account page 2017-02-01 06:54:01 +01:00
BENKE Charlie
772d862766 Update product.class.php 2017-01-31 23:13:58 +01:00
BENKE Charlie
d84e50d15c get remisepercent of product if select list
when we use the select list of product instead of free search we don't fill the remise
2017-01-31 23:11:16 +01:00
Laurent Destailleur
fbf9986506 Fix translation 2017-01-31 18:03:25 +01:00
Laurent Destailleur
2db372d99d Fix css 2017-01-31 16:17:24 +01:00
Laurent Destailleur
aaa2e393c3 Fix css 2017-01-31 16:17:10 +01:00
Laurent Destailleur
373f918543 Fix css 2017-01-31 16:14:56 +01:00
Laurent Destailleur
218e49298a Uniformize field names 2017-01-31 14:10:06 +01:00
phf
aea6a8f9ec Fix ( 2017-01-31 14:03:54 +01:00
Laurent Destailleur
4cec071af5 Add tms field 2017-01-31 14:00:53 +01:00
fappels
8e675fa039 Improve lot qty separation
Add spaces to lot info separation.
Use implode params according PHP doc.
2017-01-31 12:54:00 +01:00