lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,505 Commits 43 Branches 150 Tags 886 MiB
c6ad35e001
Commit Graph

46505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García de La Fuente
c6ad35e001 Implemented statuses submenu for List menu of supplier and customer invoices. 
Menu "Pending payment" has been moved to the "List" submenu.
 2015-03-23 13:42:50 +01:00
Laurent Destailleur
cbadfa5075 NEW: Title of page project contains project ref and label 2015-03-23 12:44:41 +01:00
Laurent Destailleur
994606dbc9 More space for tables (=> to follow css bootsrap rules) 2015-03-23 05:09:55 +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
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
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
Laurent Destailleur
b44f87f548 Clean css 2015-03-22 15:38:50 +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
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
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
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
Laurent Destailleur
33d98b52b5 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-20 20:51:50 +01:00
Laurent Destailleur
eeb09b83a1 The test on db version must not lock the phpunit 2015-03-20 20:50:46 +01:00
Laurent Destailleur
9e0aa22a04 Merge pull request #2461 from tiaris/3.7_langs_error 
Add global $langs to method, necessary for triggers to function
 2015-03-20 20:43:16 +01:00
Laurent Destailleur
0784e9638a The test on db version must not lock the phpunit 2015-03-20 17:57:40 +01:00
Laurent Destailleur
b0e928c213 Disable migration with bugged versions 2015-03-20 15:26:00 +01:00
Laurent Destailleur
2d3c3e63e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-20 15:19:52 +01:00
Laurent Destailleur
92af226fff Fix Not into official 3.7 but must be into migration for 3.7 when 
migration is done by 3.8 code
 2015-03-20 15:19:42 +01:00
Marcos García de La Fuente
70f6c3fdbb NEW: List of recent modified supplier product prices in Supplier card 2015-03-20 12:59:37 +01:00
Laurent Destailleur
5e84ce69ca Fix code to avoid callback usage (this fails on some php) 2015-03-20 12:07:34 +01:00
Laurent Destailleur
3a9c195f10 Fix hook management match spec 2015-03-20 00:34:55 +01:00
Laurent Destailleur
d442ac328c Fix: some replacement tags were missing 2015-03-19 12:34:03 +01:00
Laurent Destailleur
f44d91e153 NEW: The notification module accept keyword __SUPERVISOR__ to send 
notification to supervisor of user.
 2015-03-19 11:47:30 +01:00
Laurent Destailleur
6ceda02eaa NEW: Enhancement of module 'Notification by Email'. Show nb of 
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
 2015-03-18 21:44:57 +01:00
Laurent Destailleur
a2676e5768 Fix: the type of notification sent was not filled 2015-03-18 21:06:55 +01:00
Florian HENRY
058042d09d NEW : update skeleton and class builder 2015-03-18 17:52:17 +01:00
Laurent Destailleur
b0b88be81f Sync transifex 2015-03-18 15:27:27 +01:00
Laurent Destailleur
ba526c5a2f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-18 14:32:58 +01:00
Laurent Destailleur
cd2fc2f890 Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook 
development rules. They are "addreplace" hooks, so you must return
content with"->resprints='mycontent'" and not with "return 'mycontent'"
 2015-03-18 14:31:37 +01:00