Commit Graph

53257 Commits

Author SHA1 Message Date
aspangaro
24fddaa039 Hidden old functions 2016-04-22 06:58:18 +02:00
aspangaro
4a078db060 FIX: Migration script 2016-04-22 06:57:37 +02:00
aspangaro
8f3a254259 FIX: Bug with category functionnality 2016-04-22 06:31:40 +02:00
Laurent Destailleur
2d558174f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-21 03:19:07 +02:00
Laurent Destailleur
c2de7adb32 Minor PHPCS fixes 2016-04-21 03:18:42 +02:00
Laurent Destailleur
7adf3a4789 Merge pull request #5043 from bafbes/abb-15
new function updateExtraField to update one particular extrafield
2016-04-21 02:58:39 +02:00
Laurent Destailleur
d9e846e586 Update migrate script 2016-04-21 02:47:34 +02:00
Laurent Destailleur
8a6d97f257 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-21 02:39:37 +02:00
Laurent Destailleur
ffd10a7560 Complete function loadExpedition to add filter on fk_product 2016-04-21 02:38:49 +02:00
Laurent Destailleur
d347595d86 Merge pull request #5041 from aspangaro/4.0-p20
FIX: Accounting library already declared in line 54
2016-04-21 01:57:44 +02:00
Laurent Destailleur
b032280d07 Merge pull request #5049 from philippe-opendsi/develop
FIX #5048 Product supplier list display only one product
2016-04-21 01:54:36 +02:00
Laurent Destailleur
1e5ff7388c Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client
NEW Removed deprecated CommonObject::client property
2016-04-21 01:49:12 +02:00
Laurent Destailleur
533391f846 Merge pull request #5030 from frederic34/patch-7
FIX Using $user that was not imported
2016-04-21 01:25:59 +02:00
Laurent Destailleur
429be4678c Merge pull request #5045 from bafbes/abb-16
fix:erroneous nesting form
2016-04-21 01:23:37 +02:00
Laurent Destailleur
3ba87be4ef Merge pull request #5029 from marcosgdf/deprecated-functions
NEW Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions
2016-04-21 01:18:22 +02:00
Laurent Destailleur
4b401a03c8 Merge pull request #5028 from marcosgdf/fr-4524
NEW Renamed ActionComm::add function to ActionComm::create
2016-04-21 01:16:46 +02:00
Laurent Destailleur
30f7d4cd52 Merge pull request #5027 from marcosgdf/refactor-option
Refactored Form classes to use Form::selectarray instead of HTML code
2016-04-21 01:15:59 +02:00
Laurent Destailleur
ee5b68918f Merge pull request #5055 from placid0w/patch-1
Fix #5054
2016-04-21 00:53:51 +02:00
placid0w
7bf9c2144e Fix #5054 2016-04-20 15:43:14 -03:00
Philippe-OpenDSI
994d772947 Merge pull request #1 from philippe-opendsi/philippe-opendsi-patch-1
FIX : Product supplier list display only one product
2016-04-20 14:02:17 +02:00
Philippe-OpenDSI
c298b783ce Product supplier list display only one product
Last parameter of select_produits_fournisseurs_list is $limit, not $socidif
2016-04-20 13:59:13 +02:00
Laurent Destailleur
fb5497f3d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-19 19:52:37 +02:00
Laurent Destailleur
6d2df1f6ea Merge pull request #5007 from altatof/fichinter_order_by_date
NEW: fichinter lines ordered by rang AND DATE
2016-04-19 19:26:57 +02:00
Laurent Destailleur
349c1c2d69 Merge pull request #4999 from fappels/develop
Fix migration script
2016-04-19 19:22:37 +02:00
Laurent Destailleur
39c68c302e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-19 19:15:55 +02:00
Laurent Destailleur
08c379ad58 Fix submit photo is no more hidden on smartphone. 2016-04-19 19:15:31 +02:00
Laurent Destailleur
005751f330 Merge pull request #4963 from altatof/add_filter_type_on_turnover_report
NEW: add product type filter on turnover report
2016-04-19 19:15:04 +02:00
Laurent Destailleur
da329131bb Merge pull request #4959 from nka11/api_dev
API Improvements
2016-04-19 19:13:57 +02:00
Laurent Destailleur
d40e659b30 Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-04-19 19:11:54 +02:00
Laurent Destailleur
4619040983 Work on website module 2016-04-19 18:41:05 +02:00
abb
e673c1aad9 fix:erroneous nested form 2016-04-19 08:08:35 +01:00
abb
62aa628524 fixmycommit:new function updateExtraField to update one particular extrafield 2016-04-19 07:49:05 +01:00
abb
f0f4933905 new function updateExtraField to update one particular extrafield
Conflicts:
	htdocs/core/class/commonobject.class.php
2016-04-19 07:47:29 +01:00
aspangaro
bb554a73bd FIX: Accounting library already declared in line 54 2016-04-19 06:18:34 +02:00
Laurent Destailleur
cb1772b527 Fix too much code removed. We still need JQUERY LAYOUT for ECM module. 2016-04-19 01:45:45 +02:00
Laurent Destailleur
448ca49e28 Fix bad field 2016-04-18 21:10:30 +02:00
Laurent Destailleur
3a807d9cdb Revert a commit. The field was already added. 2016-04-18 21:07:26 +02:00
Laurent Destailleur
a88b3a8cc4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-18 21:02:34 +02:00
Laurent Destailleur
f68f5677bb Start to use the vat code to identify a vat into combo list instead of
just "rate" and "npr".
2016-04-18 21:02:14 +02:00
Juanjo Menent
5a87218622 Merge pull request #5034 from aspangaro/4.0-p19
NEW: Accountancy - Add Result page
2016-04-18 20:17:27 +02:00
Juanjo Menent
b236612975 Merge pull request #5038 from frederic34/patch-10
Update 3.9.0-4.0.0.sql
2016-04-18 20:15:17 +02:00
Juanjo Menent
48407da37b Merge pull request #5039 from frederic34/patch-11
Update rappro.php
2016-04-18 20:14:44 +02:00
Juanjo Menent
c743cdafed Merge pull request #5019 from AppChecker/develop
FIX: comparing instead of assign
2016-04-18 20:07:32 +02:00
nka11
39948968eb Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev 2016-04-18 19:13:06 +02:00
nka11
4eb1aa59aa fix coding rules 2016-04-18 19:11:28 +02:00
Frédéric FRANCE
18b3b3a31d Update rappro.php 2016-04-18 08:14:02 +02:00
Frédéric FRANCE
c6226e63b7 Update 3.9.0-4.0.0.sql 2016-04-18 08:13:01 +02:00
aspangaro
19b594ee9d Correct travis 2016-04-17 15:58:32 +02:00
aspangaro
b59c94e056 NEW: Accountancy - Add Result page
& review
2016-04-17 15:44:04 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00