aspangaro
|
f6d8d2eb23
|
Correct stats
|
2015-03-23 06:56:12 +01:00 |
|
Laurent Destailleur
|
994606dbc9
|
More space for tables (=> to follow css bootsrap rules)
|
2015-03-23 05:09:55 +01:00 |
|
Laurent Destailleur
|
7ad0a32559
|
Fix for multicompany users.
|
2015-03-23 04:51:24 +01:00 |
|
Laurent Destailleur
|
e269aa83b5
|
More comments
|
2015-03-23 04:16:58 +01:00 |
|
Laurent Destailleur
|
042556a9cf
|
Better comments
|
2015-03-23 03:50:55 +01:00 |
|
Laurent Destailleur
|
f4b1d95b3e
|
Some fix for multicompany module
|
2015-03-23 02:39:41 +01:00 |
|
Marcos García de La Fuente
|
3d50b41b8e
|
Reverted $rowid instead of $id property
|
2015-03-23 01:40:33 +01:00 |
|
Marcos García de La Fuente
|
4349f27299
|
Revert "Revert "Refactor 1""
|
2015-03-23 01:39:12 +01:00 |
|
Laurent Destailleur
|
f650a773c3
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-03-22 22:30:11 +01:00 |
|
Laurent Destailleur
|
5c36bb94f2
|
Work on theme material design
|
2015-03-22 22:29:52 +01:00 |
|
Laurent Destailleur
|
3ed0cf6a75
|
css fix
|
2015-03-22 22:25:26 +01:00 |
|
Laurent Destailleur
|
87faf530e0
|
Merge pull request #2468 from defrance69/patch-55
Update extrafields.class.php
|
2015-03-22 21:28:53 +01:00 |
|
Laurent Destailleur
|
abcebd7875
|
Merge pull request #2462 from defrance69/patch-54
Update extrafields.class.php
|
2015-03-22 21:27:38 +01:00 |
|
Laurent Destailleur
|
2632b8e25b
|
Update test page to prepare datatables architecture.
|
2015-03-22 21:26:13 +01:00 |
|
Laurent Destailleur
|
1a1959b52c
|
Fix: Solve conflict with imgup and imgdown class use for sort fields and
to drag and drop lines.
|
2015-03-22 21:18:25 +01:00 |
|
aspangaro
|
c4d852ffd7
|
Correct from frederic34
|
2015-03-22 20:57:41 +01:00 |
|
BENKE Charles
|
730593b525
|
Update extrafields.class.php
if no elementtype send at the function, they return an empty array
|
2015-03-22 20:26:20 +01:00 |
|
aspangaro
|
ad0f1aae6b
|
Move loan in htdocs
|
2015-03-22 20:19:22 +01:00 |
|
Laurent Destailleur
|
221d44a4b8
|
br at wrong place
|
2015-03-22 18:54:12 +01:00 |
|
Laurent Destailleur
|
d678b554e0
|
Fix css
|
2015-03-22 18:39:05 +01:00 |
|
Laurent Destailleur
|
49824a0e56
|
Method colorStringToArray can accept the #
Method monthArray can return short label of month
|
2015-03-22 18:17:25 +01:00 |
|
Laurent Destailleur
|
809690fad7
|
Saved logo in black int menu eldy.
Start new dev theme based on material design.
|
2015-03-22 18:09:22 +01:00 |
|
aspangaro
|
414d4c6432
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2015-03-22 18:08:12 +01:00 |
|
Laurent Destailleur
|
b44f87f548
|
Clean css
|
2015-03-22 15:38:50 +01:00 |
|
aspangaro
|
feef043513
|
Correct
|
2015-03-22 15:27:05 +01:00 |
|
Laurent Destailleur
|
f35e9a64cd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-03-22 15:26:13 +01:00 |
|
Laurent Destailleur
|
17dc76838e
|
Fix bad url
|
2015-03-22 15:25:57 +01:00 |
|
Laurent Destailleur
|
ed468f8f3f
|
Merge pull request #2466 from marcosgdf/implemented-supplier-prod-list
NEW: List of recent modified supplier product prices in Supplier card
|
2015-03-22 14:30:20 +01:00 |
|
Laurent Destailleur
|
aa5ffa0bf2
|
phpcs
|
2015-03-22 14:23:49 +01:00 |
|
Laurent Destailleur
|
2f34a5351c
|
Merge pull request #2464 from FHenry/develop
NEW : update skeleton and class builder
|
2015-03-22 14:15:50 +01:00 |
|
Laurent Destailleur
|
e2675f204d
|
Merge pull request #2449 from defrance69/patch-51
Update export.class.php
|
2015-03-22 14:07:05 +01:00 |
|
Laurent Destailleur
|
7e11a31f34
|
Merge pull request #2467 from Dolibarr/revert-2456-refactor-1
Revert "Refactor 1"
|
2015-03-22 13:16:06 +01:00 |
|
Laurent Destailleur
|
2d90256640
|
Revert "Refactor 1"
|
2015-03-22 12:51:29 +01:00 |
|
Laurent Destailleur
|
a79a779b04
|
Merge pull request #2456 from marcosgdf/refactor-1
Refactor 1
|
2015-03-22 12:47:05 +01:00 |
|
Laurent Destailleur
|
eb7f2f464e
|
Merge branch 'IonAgorria-price-global-variables' into develop
|
2015-03-22 12:45:21 +01:00 |
|
Laurent Destailleur
|
55140afde4
|
Merge branch 'price-global-variables' of
https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/dynamic_price/editor.php
|
2015-03-22 12:45:04 +01:00 |
|
Laurent Destailleur
|
15ac0894c9
|
Prepare 3.7 release
|
2015-03-22 12:22:11 +01:00 |
|
Laurent Destailleur
|
87da1d734e
|
mysql 5.5.41 is still bugged returning "lost connexion" during migration
but there is no more data loss so we can allow this version. A database
upgrade to 5.6 will be required if this occurs.
|
2015-03-22 12:13:26 +01:00 |
|
Laurent Destailleur
|
a55af4387b
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
.travis.yml
htdocs/core/class/notify.class.php
htdocs/product/stock/class/mouvementstock.class.php
test/phpunit/AllTests.php
test/phpunit/MouvementStockTest.php
|
2015-03-22 12:10:39 +01:00 |
|
aspangaro
|
dafc955848
|
Correct path
|
2015-03-22 08:25:45 +01:00 |
|
aspangaro
|
9264482e25
|
Update works
|
2015-03-22 08:20:19 +01:00 |
|
aspangaro
|
b4b3c45dbc
|
Update works
|
2015-03-21 18:00:16 +01:00 |
|
Laurent Destailleur
|
c9b569ad1a
|
Fix calculation of PMP of product.
Also add phpunit test to avoid this in future.
|
2015-03-21 15:31:11 +01:00 |
|
Laurent Destailleur
|
4f9aef6150
|
Fix calculation of PMP of product.
Also add phpunit test to avoid this in future.
|
2015-03-21 15:29:23 +01:00 |
|
aspangaro
|
462e27e069
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-21 07:13:35 +01:00 |
|
aspangaro
|
4e6c40c781
|
Update works
|
2015-03-21 07:12:32 +01:00 |
|
aspangaro
|
15e50ed24f
|
Update works
|
2015-03-21 06:21:34 +01:00 |
|
Laurent Destailleur
|
b52ee1d069
|
Merge pull request #2465 from marcosgdf/bug-delivery_date
Fixed delivery date in order list not showing up
|
2015-03-21 01:24:17 +01:00 |
|
Laurent Destailleur
|
73266bb965
|
Fix error when using a log hangler that make output into the http
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
|
2015-03-21 01:22:05 +01:00 |
|
Laurent Destailleur
|
b8ed553365
|
We must keep the @, some tools use it to know it is login page.
|
2015-03-21 01:08:29 +01:00 |
|