Laurent Destailleur
e2e95b5f8c
phpcs
2015-03-11 03:58:57 +01:00
Laurent Destailleur
a5645b626c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
htdocs/projet/element.php
2015-03-11 03:55:46 +01:00
Laurent Destailleur
c1432eb2da
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/salaries/fiche.php
htdocs/projet/element.php
2015-03-11 03:29:52 +01:00
Laurent Destailleur
ec322e2e29
Revert was not complete
2015-03-11 03:03:17 +01:00
Laurent Destailleur
4b8fa00edb
Merge pull request #2422 from guedel/sqlite3-dev
...
Sqlite3 dev
2015-03-11 02:54:15 +01:00
Laurent Destailleur
41b09d8c70
Merge pull request #2448 from atm-maxime/3.6
...
Fix : display proposal date on proposal list
2015-03-11 02:50:26 +01:00
Laurent Destailleur
52e9ae5fe4
Merge pull request #2442 from delcroip/patch-2
...
FIX: jdate returning -62169955200 on x64 machine
2015-03-11 02:35:36 +01:00
Laurent Destailleur
242a71e967
Merge pull request #2436 from marcosgdf/patch-1
...
Update ChangeLog
2015-03-11 02:31:24 +01:00
Laurent Destailleur
6f39270450
Merge pull request #2310 from FHenry/3.7
...
re-add index.html file
2015-03-11 02:29:29 +01:00
Laurent Destailleur
0b661675e2
Merge branch 'marcosgdf-bug-1825-37' into 3.7
2015-03-11 02:26:20 +01:00
Laurent Destailleur
0ff2a0ad9f
Merge branch 'bug-1825-37' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1825-37
Conflicts:
htdocs/comm/action/index.php
2015-03-11 02:26:01 +01:00
Laurent Destailleur
e8732df747
Merge pull request #2441 from aspangaro/develop-ReviewER
...
FIXED: Review Expense Report
2015-03-11 02:14:13 +01:00
Laurent Destailleur
734a7dd5c7
Merge pull request #2443 from biznext/patch-4
...
Fix Anchor link for quick access when editing.
2015-03-11 02:13:29 +01:00
Laurent Destailleur
5748ea8f35
Merge pull request #2447 from TomasVotruba/patch-1
...
travis: PHP 7.0 nightly added
2015-03-11 02:12:58 +01:00
Laurent Destailleur
f484abe5ec
Merge pull request #2446 from GPCsolutions/3.6-#1901
...
FIXED #1901 : Inverted supplier order/invoice buttons in project referring objects
2015-03-11 02:12:01 +01:00
Laurent Destailleur
c271257452
Prepare extrafield for option by default into lists
2015-03-10 22:27:16 +01:00
Laurent Destailleur
548e720ca2
Uniformize code
2015-03-10 19:31:04 +01:00
Laurent Destailleur
b4a8f19696
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/extrafields.class.php
2015-03-10 18:37:13 +01:00
Laurent Destailleur
364b185442
Fix sql syntax
2015-03-10 18:33:14 +01:00
Laurent Destailleur
154865f545
Fix return error when it is not
2015-03-10 16:37:39 +01:00
Laurent Destailleur
0df2b4cc26
Fix check parameters
2015-03-10 16:14:46 +01:00
Maxime Kohlhaas
05a2a6af00
FIX : [bug #1900 ] Unable to remove a salary with enough permissions
2015-03-10 15:53:02 +01:00
Maxime Kohlhaas
154e1a7991
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
2015-03-10 15:14:25 +01:00
Maxime Kohlhaas
978dc8170d
Fix : display proposal date on proposal list
2015-03-10 14:56:58 +01:00
Laurent Destailleur
209f8946d0
All files must be lowercase
2015-03-10 14:17:58 +01:00
Laurent Destailleur
b564b754fc
Doxygen
2015-03-10 14:09:29 +01:00
Laurent Destailleur
9a3e5d7fc5
Fix code unreachable
2015-03-10 13:58:26 +01:00
Laurent Destailleur
12be50d4ba
Doxygen
2015-03-10 13:50:05 +01:00
Laurent Destailleur
51b67704ee
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-10 13:46:44 +01:00
Laurent Destailleur
194260fc5b
NEW: Add search box for supplier order search.
2015-03-10 13:25:25 +01:00
Laurent Destailleur
d847f9581e
Fix generation of RUM number. Show it on card to help debug.
2015-03-10 11:31:23 +01:00
Laurent Destailleur
35dfaf4dd1
Natural search on numeric works also with several space after operator
2015-03-10 10:14:24 +01:00
Laurent Destailleur
2ea3eb3505
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-10 10:12:08 +01:00
Laurent Destailleur
dc30092290
Add column to store salary ref when doing payment.
2015-03-10 10:11:51 +01:00
Tomáš Votruba
a065b8a9b4
travis: PHP 7.0 nightly added
2015-03-10 09:57:40 +01:00
Laurent Destailleur
90abe5cdf9
NEW: Add current salary on list of payment
2015-03-10 09:29:24 +01:00
Laurent Destailleur
94acbeaa22
Prepare perms on extrafields
2015-03-09 21:40:24 +01:00
Laurent Destailleur
84695845bb
Some fixes into translation and permissions
2015-03-09 21:20:56 +01:00
Laurent Destailleur
88a29b7c9c
Add an advance permission to check/uncheck reception
2015-03-09 20:26:56 +01:00
Laurent Destailleur
bd81dec1a3
Fix missing translation
2015-03-09 19:28:38 +01:00
Laurent Destailleur
bd6f13e6ed
Can export extra fields of lines.
2015-03-09 19:13:19 +01:00
Raphaël Doursenaud
f8dfa61859
FIXED #1901 : Inverted supplier order/invoice buttons in project referring objects
2015-03-09 16:20:51 +01:00
Florian HENRY
15dfd7c08d
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-03-09 10:52:09 +01:00
Estephe L.
9d320e4268
Fix Anchor link for quick access when editing.
...
This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...
2015-03-08 23:29:09 +01:00
delcroix Patrick
e6984bae9d
FIX: jdate returning -62169955200 on x64 machine
...
on x64 machine jdate return -62169955200 instead of 0 when the input is 00-00-00 00:00:00 or equivalent
same issue for mktime https://bugs.php.net/bug.php?id=53662
2015-03-08 12:37:07 +01:00
aspangaro
69dc3cdd61
Correct fk_statut & work en list
2015-03-08 08:21:49 +01:00
aspangaro
f3258d59c6
Uniformize status & add price()
2015-03-08 07:21:07 +01:00
aspangaro
80ad1be820
Merge remote-tracking branch 'Upstream/develop' into develop-patch21
2015-03-08 06:40:31 +01:00
Laurent Destailleur
3894a48ffd
Fix: bad CSS
2015-03-08 02:37:25 +01:00
Laurent Destailleur
7c08f33fe1
Missing style buttonRefused
2015-03-08 02:26:41 +01:00
