Laurent Destailleur
|
5c36bb94f2
|
Work on theme material design
|
2015-03-22 22:29:52 +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 |
|
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
|
17dc76838e
|
Fix bad url
|
2015-03-22 15:25:57 +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
|
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
|
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
|
3a9c195f10
|
Fix hook management match spec
|
2015-03-20 00:34:55 +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 |
|
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
|
2c61717e10
|
Fix sql syntax error
|
2015-03-18 14:19:17 +01:00 |
|
Laurent Destailleur
|
7ef11b2f38
|
Fix selected attribute not set correctly
|
2015-03-18 13:16:59 +01:00 |
|
Laurent Destailleur
|
840b047468
|
Work on new timesheet input pages.
|
2015-03-18 11:20:08 +01:00 |
|
Laurent Destailleur
|
5d4d8151c1
|
Work on new timesheet input pages.
|
2015-03-18 11:04:50 +01:00 |
|
Laurent Destailleur
|
c700d8a8ec
|
Fix remove warning
|
2015-03-17 11:59:44 +01:00 |
|
Laurent Destailleur
|
166fda4909
|
Normalize class names
|
2015-03-17 11:26:23 +01:00 |
|
Laurent Destailleur
|
6e251690ab
|
Doxygen
|
2015-03-17 11:23:45 +01:00 |
|
Laurent Destailleur
|
84bea6166e
|
Doxygen
|
2015-03-17 10:55:45 +01:00 |
|
Laurent Destailleur
|
4fffeb3a89
|
Clean code
|
2015-03-17 10:52:27 +01:00 |
|
Laurent Destailleur
|
689d270552
|
Doxygen
|
2015-03-17 10:47:20 +01:00 |
|
Laurent Destailleur
|
bfd979224f
|
Var not declared
|
2015-03-17 10:38:25 +01:00 |
|
Laurent Destailleur
|
a73ff524e5
|
Merge pull request #2459 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2015-03-17 00:38:40 +01:00 |
|
Scrutinizer Auto-Fixer
|
b693ed3f51
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2015-03-16 23:21:17 +00:00 |
|
Laurent Destailleur
|
141fa56d67
|
Fixed bad parameter
|
2015-03-17 00:11:04 +01:00 |
|
Laurent Destailleur
|
6d7b340cee
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
|
2015-03-16 18:30:30 +01:00 |
|
Laurent Destailleur
|
daf853d040
|
Merge pull request #2455 from aspangaro/develop-ReviewER
QUAL: Traduce terms + remove <center>
|
2015-03-16 02:11:29 +01:00 |
|
Marcos García de La Fuente
|
6ba3b900b7
|
PHPCS Fix
|
2015-03-15 23:42:11 +01:00 |
|
Marcos García de La Fuente
|
086e439543
|
Merge branch 'develop' into refactor-1
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
|
2015-03-15 18:16:55 +01:00 |
|
Marcos García de La Fuente
|
efb9f7f4fd
|
Merge branch 'develop' into refactor-1
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/includes/tcpdi/fpdf_tpl.php
|
2015-03-15 18:07:30 +01:00 |
|
Marcos García de La Fuente
|
2e68b51a10
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-03-15 17:52:07 +01:00 |
|
aspangaro
|
d69f066735
|
QUAL: Traduce terms + remove <center>
|
2015-03-15 14:04:07 +01:00 |
|
BENKE Charles
|
8f0e514f83
|
Update pdf_paiement.class.php
Add bank account on detail line (usefull when you have many bank account)
Add society name in the header (usefull when you nanage many society)
|
2015-03-15 10:49:16 +01:00 |
|
Ion Agorria
|
2c80b39937
|
Configuration page of dinamic prices and price global variables editor
|
2015-03-14 16:51:38 +01:00 |
|
Ion Agorria
|
5f9b1fa029
|
Changes for applying new paths
|
2015-03-14 16:50:02 +01:00 |
|
Laurent Destailleur
|
10bbf463e7
|
Several bug fixes from scrutinizer
|
2015-03-14 14:55:41 +01:00 |
|
Laurent Destailleur
|
ca34575df4
|
FIXED: Allowed 0 to be used as an account mask. Required by CEGID.
|
2015-03-14 13:42:00 +01:00 |
|
BENKE Charles
|
9e62013bca
|
Update admin_extrafields_edit.tpl.php
add new type of extrafields : link
|
2015-03-14 12:44:26 +01:00 |
|
BENKE Charles
|
4783db82ac
|
Update admin_extrafields_add.tpl.php
new type of extrafield : link
|
2015-03-14 12:42:52 +01:00 |
|
Laurent Destailleur
|
5670e92842
|
Position of field into pdf baleine
|
2015-03-14 12:35:03 +01:00 |
|
BENKE Charles
|
0aa2360691
|
Update extrafields.class.php
add new extrafields type 'link'
|
2015-03-14 12:31:22 +01:00 |
|
BENKE Charles
|
df9f822a70
|
Update commonobject.class.php
new extafields type
|
2015-03-14 12:25:17 +01:00 |
|
BENKE Charles
|
41a05bc4ba
|
Update actions_extrafields.inc.php
add new type of extrafields "link" : linked to dolibarr element
|
2015-03-14 12:04:00 +01:00 |
|
Laurent Destailleur
|
d056abc4e1
|
No need to have this protected. Property can be read with method show()
and this method can be override.
|
2015-03-13 21:45:52 +01:00 |
|
Laurent Destailleur
|
ba2c0a2651
|
Clean code of hooks.
Extrafield index on fk_object must be unique.
|
2015-03-13 20:27:54 +01:00 |
|