Commit Graph

52024 Commits

Author SHA1 Message Date
Laurent Destailleur
d8cbe39c46 Merge pull request #4461 from frederic34/patch-8
total records for payment list
2016-01-22 04:13:02 +01:00
Laurent Destailleur
d7da972ead Merge pull request #4460 from frederic34/patch-7
total records for deposit list
2016-01-22 04:12:49 +01:00
Laurent Destailleur
a406334643 Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification
FIX line refetch incompatible with hook practice
2016-01-22 04:10:06 +01:00
Laurent Destailleur
9fd56df03f Merge pull request #4444 from marcosgdf/bug-4440-2
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
2016-01-22 03:47:22 +01:00
Laurent Destailleur
9d63cb0156 Merge pull request #4452 from hregis/3.7_bug
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
2016-01-22 03:45:35 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
cbd01bae49 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/societe/index.php
2016-01-22 03:18:51 +01:00
Laurent Destailleur
d857b3475b Fix doxygen 2016-01-22 03:07:46 +01:00
Laurent Destailleur
56a4466b5b Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-22 03:04:22 +01:00
Laurent Destailleur
34c648b351 FIX #4418 2016-01-22 03:04:07 +01:00
Laurent Destailleur
cc71445b45 Fix: Only one name for one same feature. 2016-01-22 02:41:51 +01:00
Laurent Destailleur
e6653ea14f Merge pull request #4333 from defrance/patch-94
Parameters harmonization of hook call
2016-01-22 02:35:21 +01:00
Laurent Destailleur
d2f5f5c01f Merge pull request #4266 from fappels/develop_multi_warehouse
Add shipping and dispatching from/to multiple warehouses
2016-01-22 02:26:25 +01:00
Laurent Destailleur
d7847a8ec8 Merge pull request #4256 from GPCsolutions/dolibarr-mysqli
[Qual] mysqli code review
2016-01-22 02:22:47 +01:00
Laurent Destailleur
cd71d53ffd Merge pull request #4422 from marcosgdf/patch-2
Corrected wrong translation
2016-01-22 02:11:46 +01:00
Laurent Destailleur
e39fc95bd1 Merge pull request #4476 from aspangaro/develop-p3
Fix: Modify length of code journal for accountancy in bank account
2016-01-22 02:11:29 +01:00
Laurent Destailleur
600a4e961b Merge pull request #4464 from frederic34/patch-10
typo
2016-01-22 02:11:01 +01:00
Laurent Destailleur
219ce73ea2 Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook
FIX nblignes not calculated after hook and hook can't modify this val...
2016-01-22 02:10:36 +01:00
Laurent Destailleur
e1ac249d18 Increase size of field 2016-01-21 23:28:14 +01:00
Laurent Destailleur
4e87afddf1 Fix: why a floating float here ? 2016-01-21 22:44:05 +01:00
Laurent Destailleur
35d9b25d82 Fix: why a floating float here ? 2016-01-21 22:43:20 +01:00
phf
148a5947a7 FIX update propal line the multicurrency price do not change 2016-01-21 22:40:07 +01:00
phf
68857499d7 NEW display multicurrency price on azur pdf model 2016-01-21 22:26:51 +01:00
phf
2d4f355792 FIX back quote into migration sql file 2016-01-21 21:57:09 +01:00
phf
8487058c98 FIX add input multicurrency_subprice on edit line 2016-01-21 21:54:57 +01:00
phf
f7afbcff68 NEW integration of multicurrency module (creation fields in database and admin)
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
2016-01-21 21:38:52 +01:00
aspangaro
84ff86ab50 Merge remote-tracking branch 'Upstream/develop' into develop-p3 2016-01-21 20:53:42 +01:00
aspangaro
ddc2e8bfbe Fix: Modify length of code journal for accountancy in bank account 2016-01-21 20:52:15 +01:00
bobby
57035ace24 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-21 17:09:00 +01:00
Laurent Destailleur
45363cbf4c Save space on user card so groups are more visible 2016-01-21 16:10:20 +01:00
Laurent Destailleur
b5c047d9a5 Fix link on project ref on task list must jump to tab task 2016-01-21 15:15:26 +01:00
Laurent Destailleur
39aede4071 Fix bad list of project/tasks 2016-01-21 15:09:46 +01:00
Laurent Destailleur
dd6e60630d Fix size of cells make page too large even for large screen 2016-01-21 15:01:53 +01:00
Laurent Destailleur
3c68ac55b9 Fix missing loading lang 2016-01-21 15:00:39 +01:00
Laurent Destailleur
ddd8f8586f Fix rewrite of project and task list to solve bad listing
Fix correct sort and pagination of lists
2016-01-21 14:59:09 +01:00
Laurent Destailleur
19bcdb6910 Fix size of cells make page too large even for large screen 2016-01-21 14:56:26 +01:00
Laurent Destailleur
de19e12833 Little css enhancement 2016-01-21 14:53:12 +01:00
Laurent Destailleur
1ec3454925 Add option to show a box on dashboard (that may be very very long) 2016-01-21 14:13:38 +01:00
Laurent Destailleur
55dc6c31fc Minor performance enhancement 2016-01-21 14:12:17 +01:00
Laurent Destailleur
4dc812618a NEW Add index on invoice status
NEW Add constant MAIN_LOGTOHTML to 0 into other setup by default to save
time when we need to make debug on hosted instance.
2016-01-21 10:37:43 +01:00
aspangaro
ce01155678 New: Add a new Id. prof. for Morrocan 2016-01-21 06:01:05 +01:00
aspangaro
8a36bda3d2 Merge remote-tracking branch 'Upstream/3.9' into 3.9-p8 2016-01-21 05:46:11 +01:00
aspangaro
192c58f10d Fix: Commercial index presentation - missing $var=!$var when we have no data 2016-01-21 05:44:53 +01:00
Frédéric FRANCE
b0530539f4 Update rappro.php 2016-01-20 13:59:56 +01:00
Laurent Destailleur
03461d124a Fix activation of cron jobs by external module
Clean code for task lists pages.
2016-01-19 23:45:03 +01:00
BENKE Charlie
2036f17df5 if FAC_FORCE_DATE_VALIDATION can't change the billing date 2016-01-19 21:45:44 +01:00
Frédéric FRANCE
0a7de725b0 typo 2016-01-19 19:08:01 +01:00
Frédéric FRANCE
d242d6ec6d Update card.php 2016-01-19 17:39:21 +01:00
Frédéric FRANCE
b97417f3bf Update list.php 2016-01-19 12:18:29 +01:00