Laurent Destailleur
0951042dad
Fix: no need of translation tab if multilang was disabled.
2016-01-14 15:00:31 +01:00
Laurent Destailleur
b8b84c67a6
Fix bad setting of default actioncode
2016-01-14 14:15:14 +01:00
arnaud
8b2541ebf9
FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules
2016-01-14 14:10:50 +01:00
Laurent Destailleur
ef7061a575
Fix bad management of option SOCIETE_DISABLE_PROSPECTS and
...
SOCIETE_DISABLE_CUSTOMERS
2016-01-14 12:49:23 +01:00
Laurent Destailleur
23dd6b8388
Fix bad management of option SOCIETE_DISABLE_PROSPECTS and
...
SOCIETE_DISABLE_CUSTOMERS
2016-01-14 12:35:55 +01:00
Laurent Destailleur
ecb4661155
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-01-14 11:23:11 +01:00
Laurent Destailleur
63ebd40ceb
Fix bad var value
2016-01-14 11:22:59 +01:00
Laurent Destailleur
d98415f9b5
Merge pull request #4413 from hregis/3.8_bug
...
Fix: ajax error with multicompany module
2016-01-14 11:08:16 +01:00
Laurent Destailleur
7b4ebb498e
Merge pull request #4415 from fappels/3.9-4409
...
Fix #4409 totals not shown in stock/list
2016-01-14 11:07:47 +01:00
Laurent Destailleur
a8148b8b40
FIX Bug: Delivery order and date are not displayed #4372
2016-01-13 20:56:20 +01:00
Laurent Destailleur
55a056a449
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-01-13 20:41:47 +01:00
Laurent Destailleur
71b264dd86
FIX Bug: Delivery order and date are not displayed #4372
...
Link between shipment and delivery receipt was lost.
Status for receipt must not use same label than shipments.
2016-01-13 20:41:32 +01:00
fappels
f150676908
Fix #4409 totals not shown in stock/list
2016-01-13 16:33:51 +01:00
Regis Houssin
3a3ae90a0a
Fix: ajax error with multicompany module
2016-01-13 15:44:26 +01:00
phf
9b682e095f
FIX can't clone event
2016-01-13 14:41:32 +01:00
Laurent Destailleur
2c24094d60
Fix bad tab on bad home area page
2016-01-13 13:54:11 +01:00
Laurent Destailleur
9ba25be9bb
Change category for application
2016-01-13 13:37:24 +01:00
Laurent Destailleur
f74dfe282b
Fix missing default setup when module is enabled
2016-01-13 13:36:44 +01:00
Laurent Destailleur
93ed7c098b
Merge pull request #4407 from atm-ph/fix_3.8_pdf_muscadet_use_hour
...
FIX pdf_muscadet delivery hour
2016-01-12 23:21:05 +01:00
Laurent Destailleur
1b1bd73e6b
Merge pull request #4404 from frederic34/patch-8
...
FIX When doing payment for money back, bank account was not set by default
2016-01-12 23:20:32 +01:00
Laurent Destailleur
85747c7383
Merge pull request #4400 from aspangaro/3.8-p1
...
Fix : #4394 Untranslated label in list of expense reports
2016-01-12 23:14:16 +01:00
Laurent Destailleur
0f53c49673
Merge pull request #4392 from aspangaro/3.9-p5
...
Fix: HRM index typo and presentation
2016-01-12 23:00:06 +01:00
Laurent Destailleur
233dc051a1
Merge pull request #4384 from hregis/3.9_bug
...
Fix: Gives the possibility to the module, to provide his own family info
2016-01-12 22:59:43 +01:00
Laurent Destailleur
5b26f456f4
Merge pull request #4356 from GPCsolutions/3.8-4291
...
FIX #4291 Correctly filter bank card GETPOSTs
2016-01-12 22:51:17 +01:00
Laurent Destailleur
64026c41f8
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-01-12 22:03:34 +01:00
Laurent Destailleur
d7fdcc83bb
Fix missing search criteria
2016-01-12 22:03:19 +01:00
fmarcet
79992b4947
FIX: The third dashboard don't consider user permissions
2016-01-12 11:34:50 +01:00
phf
f280061a90
FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf
2016-01-12 11:09:47 +01:00
Frédéric FRANCE
92885065c6
Update facture.php
2016-01-12 10:09:02 +01:00
aspangaro
7552fa20eb
Fix : #4394 Untranslated label in list of expense reports
2016-01-11 21:18:12 +01:00
Raphaël Doursenaud
7281338f8d
FIX #4291 Correctly filter bank card GETPOSTs
2016-01-11 10:51:45 +01:00
aspangaro
880a794acd
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p5
2016-01-10 19:54:38 +01:00
Laurent Destailleur
bf09800540
Fix function signature
2016-01-10 18:52:26 +01:00
Laurent Destailleur
861376e461
Merge branch '3.7' of github.com:Dolibarr/dolibarr into 3.7
2016-01-10 18:49:11 +01:00
Laurent Destailleur
a9f0d6964a
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
2016-01-10 18:47:47 +01:00
Laurent Destailleur
801e2bca4b
Fix #4239
2016-01-10 18:42:35 +01:00
Laurent Destailleur
cdaccf7c4b
Fix: markRate can be 100
2016-01-10 18:28:50 +01:00
aspangaro
a88773cb81
Fix: Some problems presentation on accountancy module
2016-01-10 15:44:14 +01:00
aspangaro
47f63172e3
Fix: HRM index typo and presentation
2016-01-10 14:58:54 +01:00
Laurent Destailleur
70b57322a2
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-01-10 13:05:35 +01:00
Laurent Destailleur
6685502d5c
Fix add Croatia into list of country in EEC
2016-01-10 13:05:22 +01:00
Regis Houssin
694530bfae
Fix: Gives the possibility to the module, to provide his own family info
...
and position of this family. (canceled $this->family)
2016-01-10 13:00:48 +01:00
Laurent Destailleur
94814e58e5
Merge pull request #4334 from olsesacl/patch-1
...
Fix check userlocaltax1_rate and userlocaltax2_rate
2016-01-10 11:51:26 +01:00
Laurent Destailleur
40f0d0c9f2
Merge pull request #4321 from fmarcet/3.7
...
FIX: Email templates not compatible with Multicompany
2016-01-10 11:49:37 +01:00
Laurent Destailleur
70ffcfea33
Merge pull request #4380 from aspangaro/3.9-p4
...
Fix: Donation some problems with french article
2016-01-10 11:46:12 +01:00
Laurent Destailleur
d8001a8e7a
Merge pull request #4379 from aspangaro/3.9-p3
...
Fix: SQL error on user bank tab
2016-01-10 11:45:40 +01:00
Laurent Destailleur
ffe80a36e1
Merge pull request #4378 from aspangaro/3.9-p1
...
Fix: Add missing key language for propal
2016-01-10 11:43:54 +01:00
Laurent Destailleur
c22bc8a29e
Merge pull request #4377 from aspangaro/3.9-p2
...
Fix: Wrong language file for 2 menu entries in accountancy module
2016-01-10 11:38:21 +01:00
Laurent Destailleur
aa0b002119
Fix #4354
2016-01-10 11:35:06 +01:00
Laurent Destailleur
fddd02eecc
Complete fix #4354
2016-01-10 11:31:22 +01:00
aspangaro
965a96784c
Fix: Donation some problems with french article
2016-01-10 07:35:00 +01:00
aspangaro
87f1e55bcb
Fix: SQL error on user bank tab
2016-01-10 07:08:49 +01:00
aspangaro
af9e46d179
Fix: Wrong language file for 2 menu entries in accountancy module
2016-01-10 06:56:20 +01:00
aspangaro
e82f7761bc
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p1
2016-01-10 06:26:42 +01:00
Laurent Destailleur
2764fb240f
Fix text color for category tags
...
Fix banner for category translation tab
2016-01-10 00:11:49 +01:00
aspangaro
3ff9fe3123
Fix: Add missing key language for propal
2016-01-09 08:26:08 +01:00
Laurent Destailleur
b2924885aa
Fix css
2016-01-09 03:00:12 +01:00
Laurent Destailleur
a8758fa5b7
Bug war week-end: Fix a duplicate page on holiday, fix missing badge on
...
some documents tabs.
2016-01-09 01:54:46 +01:00
Laurent Destailleur
0d8788e552
FIX It was not possible to define if leave type need to be followed by a
...
counter or not. Added also a message to ask user to finish setup if no
leave with counter was setup.
2016-01-09 01:18:53 +01:00
Laurent Destailleur
e79750dc89
I continue bug war week-end
2016-01-09 00:44:06 +01:00
Laurent Destailleur
e5d0bc9d57
Fix permission not used
2016-01-09 00:34:15 +01:00
Laurent Destailleur
06c97b931b
Fix css
2016-01-09 00:06:16 +01:00
Laurent Destailleur
37c106acff
Fix search on shipment
2016-01-08 23:59:02 +01:00
Laurent Destailleur
99f3870ee6
Fix no picot if no warehouse set
...
Fix search on warehouse
2016-01-08 23:54:40 +01:00
Laurent Destailleur
a0d11e157b
Fix select2 component go over parent container so we introduce option to
...
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
127354f0af
Minor fixes
2016-01-08 22:41:30 +01:00
Laurent Destailleur
f9933aba0c
Install style match application style
2016-01-08 22:23:57 +01:00
Laurent Destailleur
c9176cd6b4
Missing translation
2016-01-08 18:22:41 +01:00
Laurent Destailleur
de36db19bc
Fix do not show warehouse for shipment on not predefined product
2016-01-08 18:15:53 +01:00
Laurent Destailleur
b6895c7c1f
Fix: a badge css was found into an array
2016-01-08 17:23:25 +01:00
Laurent Destailleur
87c236b534
Fix when error creating invoice from predefined invoice, we must go back
...
to create page from same predefined invoice.
2016-01-08 16:30:43 +01:00
Laurent Destailleur
20f1455090
FIX #4314
2016-01-08 15:45:23 +01:00
Laurent Destailleur
2259cf2340
Merge remote-tracking branch 'origin/3.8' into develop
2016-01-08 14:49:00 +01:00
Laurent Destailleur
8366310f0f
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/admin/agenda_extsites.php
2016-01-08 14:47:46 +01:00
Laurent Destailleur
e008922919
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/admin/agenda_extsites.php
2016-01-08 14:45:53 +01:00
Laurent Destailleur
5414cb6f12
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2016-01-08 14:43:20 +01:00
Laurent Destailleur
a26a6c2449
Fix sql injection even when code is on several lines
2016-01-08 14:43:04 +01:00
Laurent Destailleur
c2b8be9aaf
Merge pull request #4355 from GPCsolutions/3.6-4291
...
FIX #4291 Correctly filter external calendar GETPOSTs
2016-01-08 14:23:56 +01:00
Laurent Destailleur
844e8bff83
Better fix for #4354
2016-01-08 14:22:21 +01:00
Laurent Destailleur
6a058edc23
Revert "Debug of module leave requests "
2016-01-08 14:15:22 +01:00
Laurent Destailleur
cce473b2cb
Merge pull request #4354 from T-B-A-I/patch-1
...
Debug of module leave requests
2016-01-08 14:13:08 +01:00
Laurent Destailleur
d4aa83e7ca
Merge pull request #4343 from grandoc/develop
...
translations
2016-01-08 14:07:05 +01:00
Laurent Destailleur
36dc8b1ce7
FIX #4341
2016-01-08 13:57:53 +01:00
Laurent Destailleur
5785744d5a
Add ignore
2016-01-08 13:06:38 +01:00
Laurent Destailleur
cbe65fbc79
Fix: fields added into 3.8 to store email event was not enough. To late
...
to use them. Will be done into 4.0
2016-01-08 13:05:56 +01:00
Raphaël Doursenaud
f2178f0369
FIX #4291 Correctly filter external calendar GETPOSTs
2016-01-08 06:42:28 +01:00
TBAI
8c48785de7
Debug of module leave requests
...
Add text in holiday module
2016-01-07 20:10:22 +01:00
TBAI
f28ebefe93
Debug of module leave requests
...
Cancel leave isn't possible if it has been validated
2016-01-07 19:53:59 +01:00
TBAI
b2aa1f2115
Debug of module leave requests
...
Cancel leave isn't possible if it has been validated
2016-01-07 19:32:25 +01:00
Laurent Destailleur
3c5eaf87d5
Fix dol_fiche_head and end missing
2016-01-07 18:48:46 +01:00
Laurent Destailleur
0eae624a60
Add protection to avoid packaging external tested modules
2016-01-07 18:13:15 +01:00
Laurent Destailleur
befe58ab98
Fix selection of first entry into select
2016-01-07 13:44:19 +01:00
Laurent Destailleur
b3cb037abb
Neutral color
2016-01-07 11:43:53 +01:00
Laurent Destailleur
4e2d4a6651
Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible.
...
Solved this by completing tooltip info.
2016-01-07 11:01:37 +01:00
philippe grand
7b7f2e9fed
translations
2016-01-07 10:07:05 +01:00
Sergio Sanchis Climent
dfdf58051e
Edited correctly for check values
2016-01-07 09:37:04 +01:00
fmarcet
d8360a2a01
FIX: Email templates not compatible with Multicompany
2016-01-07 08:18:36 +01:00
Laurent Destailleur
9d3afe45d3
Merge pull request #4340 from hregis/3.8_bug
...
Fix: disable main.inc.php hooks
2016-01-07 00:08:48 +01:00
Laurent Destailleur
b4d9f1bece
Merge pull request #4338 from frederic34/patch-10
...
FIX: Missing leave request type when calling function
2016-01-07 00:07:29 +01:00
Laurent Destailleur
9200a4b69d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-07 00:05:39 +01:00
Laurent Destailleur
2945d2d171
Fix bad condition to show tabs
2016-01-07 00:05:28 +01:00
Laurent Destailleur
a974fa858d
Merge pull request #4328 from frederic34/patch-8
...
Indentation
2016-01-06 18:51:55 +01:00
Laurent Destailleur
d6c5a73264
Fix missing payment fields definition in export
2016-01-06 17:37:01 +01:00
Regis Houssin
3ae5da1cd6
Fix: disable main.inc.php hooks
2016-01-06 16:18:52 +01:00
Frédéric FRANCE
4dacf462db
Update card.php
2016-01-05 17:36:48 +01:00
Frédéric FRANCE
a0b3cdbd21
Update list.php
2016-01-05 17:33:54 +01:00
Sergio Sanchis Climent
ffd7f4ea30
Fix userlocaltax
...
Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no enter in if, now check if diferent 0 and now enter
2016-01-05 09:47:14 +01:00
fmarcet
cafe148f72
FIX: Email templates not compatible with Multicompany
2016-01-04 09:12:27 +01:00
Laurent Destailleur
f6fead7403
Merge pull request #4317 from marcosgdf/bug-3798
...
FIX #3798 #2519 Cron jobs would never be executed
2016-01-03 19:36:58 +01:00
Laurent Destailleur
1e1d6d4955
Fix to be able to use dolibarr with a smartphone
2016-01-03 19:34:19 +01:00
Laurent Destailleur
b2c41d8565
Fix search forms
2016-01-03 18:46:10 +01:00
Laurent Destailleur
abe3f192fa
Debug and fix when using dolibarr with jmobile
2016-01-03 16:23:23 +01:00
Marcos García de La Fuente
ae2295d019
Improvement suggested by @eldy
2016-01-03 15:10:22 +01:00
Laurent Destailleur
96e5651ed5
Fix missing field on list. Restor ability to search on supplier ref.
2016-01-03 14:38:47 +01:00
Laurent Destailleur
d5fa91f7ba
Fix several bugs in css and in jmobile usage
2016-01-02 20:48:19 +01:00
Frédéric FRANCE
998649d467
Indentation
2016-01-02 18:51:31 +01:00
Laurent Destailleur
d02c261d2e
Fix perf test was using a not existing js file.
2016-01-02 18:13:41 +01:00
Laurent Destailleur
0314b3b5b1
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
2016-01-02 12:27:08 +01:00
Laurent Destailleur
0cad938e09
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/install/upgrade.php
2016-01-02 12:19:49 +01:00
Laurent Destailleur
b46aec8e7e
Fix to allow phpunit of migration process for 3.5 to 3.6
2016-01-02 12:18:26 +01:00
Laurent Destailleur
35ce670bf2
Fix to allow phpunit of migration process for 3.4 to 3.5
2016-01-02 12:18:12 +01:00
Laurent Destailleur
5b305249a6
Merge pull request #4327 from braito4/patch-1
...
FIX #4326 PHP7 Warning
2016-01-02 11:56:54 +01:00
Laurent Destailleur
04c5516483
Fix the format "dayall" does not exists. Instead add missing format
...
"_locale" using correct language file.
2016-01-02 11:51:40 +01:00
braito4
9b3533e753
FIX #4326 PHP7 Warning
2016-01-02 11:42:43 +01:00
Laurent Destailleur
865d93b19e
Merge pull request #4324 from defrance/patch-93
...
Add rfc and dayall format for extrafields date
2016-01-02 11:39:42 +01:00
Laurent Destailleur
273f3678bc
Fix no ?> at end of php files
2016-01-02 00:32:22 +01:00
Laurent Destailleur
1ae4bef04b
Fix conflict with the div #dialog used for popup cut and paste of
...
address.
2016-01-02 00:27:14 +01:00
Laurent Destailleur
a7b2f000d8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-01 23:44:35 +01:00
Laurent Destailleur
52cd5d505e
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
BENKE Charlie
dbb8e49654
Update commondocgenerator.class.php
2016-01-01 12:47:27 +01:00
BENKE Charlie
b1aba4b93b
Add rfc and dayall format for extrafields date
2015-12-31 18:50:28 +01:00
phf
fffc8a430d
FIX call trigger LINEBILL_SUPPLIER_CREATE
2015-12-31 15:48:16 +01:00
Laurent Destailleur
2cbcbb8f85
Merge pull request #4319 from ParisLiakos/develop
...
FIX MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden
2015-12-31 15:04:16 +01:00
Laurent Destailleur
a234482d08
FIX #3694
2015-12-31 14:55:53 +01:00
Laurent Destailleur
c004342976
FIX #3694
2015-12-31 14:55:10 +01:00
Laurent Destailleur
bc56b9a2a7
Merge pull request #4313 from braito4/patch-2
...
Fix Warning #4229 PHP7
2015-12-31 14:48:50 +01:00
Laurent Destailleur
c63cbe34c6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-31 12:02:36 +01:00
Laurent Destailleur
5a49b8ce53
Fix: error when running install twice
...
Fix: a minor error was locking the full upgrade process.
2015-12-31 12:02:22 +01:00
Juanjo Menent
3aba3eda3c
Merge pull request #4316 from marcosgdf/bug-4272
...
FIX #4272 Error when trying to print the page "Linked objects" of a Thirdparty
2015-12-30 21:49:52 +01:00
Juanjo Menent
08b4903057
Merge pull request #4315 from marcosgdf/bug-4155
...
FIX #4155 Search Categories error
2015-12-30 21:49:25 +01:00
fmarcet
cebb996120
FIX: Email templates not compatible with Multicompany
2015-12-29 11:22:18 +01:00
fmarcet
f8e156ea30
FIX: Email templates not compatible with Multicompany
2015-12-29 10:35:10 +01:00
Paris Liakos
b6b422042c
MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden
2015-12-29 03:43:49 +02:00
Sof
c04eef35d5
FIX: Field cost_price does not exist and typos
2015-12-28 19:07:25 +01:00
Marcos García de La Fuente
039039bb00
FIX #3798 #2519 Cron jobs would never be executed
2015-12-28 15:17:53 +01:00
Marcos García de La Fuente
bec00e37e0
FIX #4272 Error when trying to print the page "Linked objects" of a Thirdparty
2015-12-28 15:04:24 +01:00
Marcos García de La Fuente
5773171efc
FIX #4155 Search Categories error
2015-12-28 14:04:37 +01:00
Laurent Destailleur
41516093bb
Syn transifex
2015-12-28 12:21:24 +01:00
braito4
47ee8993d3
fix travis
2015-12-28 11:47:12 +01:00
braito4
07f7717b51
Fix Warning #4229 PHP7
2015-12-28 11:28:18 +01:00
Laurent Destailleur
ed3f0ce86b
Fix totalnboflines not correctly managed
2015-12-28 00:20:48 +01:00
Laurent Destailleur
6905842794
Update list of module in demo with new 3.8 modules
2015-12-27 20:31:39 +01:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Laurent Destailleur
e536e10269
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-howto.txt
htdocs/filefunc.inc.php
2015-12-27 19:06:31 +01:00
Laurent Destailleur
06754068ff
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
build/makepack-dolibarr.pl
build/makepack-howto.txt
htdocs/filefunc.inc.php
2015-12-27 19:02:19 +01:00
Laurent Destailleur
96bc2023f3
Prepare package 3.6.6
2015-12-27 18:56:15 +01:00
Laurent Destailleur
40963f2f2a
FIX #4207
2015-12-27 18:46:21 +01:00
Laurent Destailleur
bf15ff56e7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-27 18:26:31 +01:00
Laurent Destailleur
0645938283
FIX #4230 PHP7 error
2015-12-27 18:26:21 +01:00
Laurent Destailleur
46d122c43a
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-12-27 18:20:58 +01:00
Laurent Destailleur
97030b05ce
FIX #4281
2015-12-27 18:20:39 +01:00
Laurent Destailleur
5afed31265
Merge pull request #4305 from marcosgdf/bug-4036
...
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
2015-12-27 17:37:29 +01:00
Laurent Destailleur
80989fd2c9
Merge pull request #4304 from marcosgdf/bug-4302
...
FIX #4302 Undefined variable $conf in Commande::LibStatut
2015-12-27 17:37:02 +01:00
Laurent Destailleur
ff6dc32827
Merge pull request #4303 from marcosgdf/bug-4282
...
FIX #4282 Defined shipping time were not shown in Customer order's PDF documents
2015-12-27 17:36:48 +01:00
Laurent Destailleur
299e34f3ee
Merge pull request #4294 from marcosgdf/bug-4287
...
FIX #4287 SQL error when accessing an unexisting proposal
2015-12-27 17:33:09 +01:00
Laurent Destailleur
e93ec106bc
Merge pull request #4290 from defrance/patch-92
...
add odt info function call if present in class
2015-12-27 17:26:26 +01:00
Laurent Destailleur
a9b52f36e6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-27 17:06:05 +01:00
Laurent Destailleur
c64eac5e72
Fix doc and mysql min version
2015-12-27 17:05:56 +01:00
Marcos García de La Fuente
ebdaf7dfa6
FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7
2015-12-27 15:12:02 +01:00
Marcos García de La Fuente
c40c695d20
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
2015-12-27 14:58:33 +01:00
Marcos García de La Fuente
98351d6fec
FIX #4302 Undefined variable $conf in Commande::LibStatut
2015-12-27 13:15:05 +01:00
Marcos García de La Fuente
67bdfa2617
FIX #4282 Defined shipping time were not shown in Customer order's PDF documents
2015-12-27 13:10:33 +01:00
Regis Houssin
c65babf3b5
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
2015-12-27 12:50:41 +01:00
bobby
e557c002c8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-26 11:56:10 +01:00
Marcos García de La Fuente
686348a0d6
FIX #4287 SQL error when accessing an unexisting proposal
2015-12-25 11:47:48 +01:00
Marcos García
da959c5cf0
Little typo in commit 8b633ae
2015-12-25 11:32:13 +01:00
Juanjo Menent
c6093fff3e
Merge pull request #4289 from marcosgdf/bug-4285
...
FIX #4285 SQL query shown when accessing an unexisting invoice
2015-12-24 22:00:00 +01:00
Juanjo Menent
d4466a652a
Merge pull request #4288 from marcosgdf/bug-4182
...
FIX #4182 SQL error when deleting an unexisting bank entry
2015-12-24 21:59:16 +01:00
Juanjo Menent
cdd1641b66
Merge pull request #4284 from frederic34/patch-7
...
typo
2015-12-24 15:50:24 +01:00
BENKE Charlie
ed501cec46
add odt info is present in class
2015-12-24 15:44:56 +01:00
Juanjo Menent
b9d0fc5aaf
Merge pull request #4271 from grandoc/develop
...
[Qual] Uniformize code
2015-12-24 15:43:14 +01:00
BENKE Charlie
9c78b083bd
add display odt info if method present in class
2015-12-24 15:42:47 +01:00
Marcos García de La Fuente
de1625b9de
FIX #4285 SQL query shown when accessing an unexisting invoice
2015-12-24 14:46:01 +01:00
Marcos García de La Fuente
8b633aee66
FIX #4182 SQL error when deleting an unexisting bank entry
2015-12-24 14:39:28 +01:00
Marcos García de La Fuente
d30c64413d
FIX #4055 SQL error when trying to access a non-existing expedition
2015-12-24 14:27:12 +01:00
Laurent Destailleur
a4d5e022cf
Fix pagination on limit failed when limit was forced on url
2015-12-24 12:52:11 +01:00
Laurent Destailleur
8c1f271356
Maxi debug of module leave requests.
2015-12-24 12:37:38 +01:00
Laurent Destailleur
66e0c1285e
Disable a bugged box
2015-12-24 11:38:30 +01:00
Laurent Destailleur
74e8738ca7
Fix: if option to select thirdparties using a combo box after n chars
...
was on, it was no more possible to clear the filter.
2015-12-24 11:24:56 +01:00
Frédéric FRANCE
45b60c7800
typo
2015-12-24 00:01:05 +01:00
Laurent Destailleur
18fdb75c98
Missing global
2015-12-23 20:02:15 +01:00
Laurent Destailleur
a9db42ddc1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-23 20:00:16 +01:00
Laurent Destailleur
559e621fd2
Fix conflict with trigger to delete payment customer and supplier.
2015-12-23 19:54:56 +01:00
Laurent Destailleur
2d3915b88c
Fix hook implementation on some thirdparty pages
2015-12-23 14:31:42 +01:00
Florian HENRY
930eb6dccf
FIX : bug with head.lib.js if MAIN_MAX_DECIMALS_SHOWN use ...
...
FIX : List of supplier order to invoice must use billed new column
2015-12-23 14:15:30 +01:00
Florian HENRY
9441d98890
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-23 14:01:16 +01:00
philippe grand
1eeee203d7
[Qual] comments should be in english
2015-12-22 09:37:27 +01:00
philippe grand
5e3c89fdbd
[Qual] Uniformize code
2015-12-21 22:59:12 +01:00
Juanjo Menent
442006dba5
Merge pull request #4265 from grandoc/develop
...
[Qual] Uniformize code
2015-12-21 20:59:25 +01:00
Laurent Destailleur
6b25439161
Fix vietnamesefont
2015-12-21 20:41:02 +01:00
Laurent Destailleur
a1990f4c63
Fix css md theme
2015-12-21 17:34:21 +01:00
Laurent Destailleur
ad5f65e988
Fix: use the mini image on tooltip of thirdparties
2015-12-21 17:32:57 +01:00
Laurent Destailleur
dcbad8bb15
Fix delete of image
2015-12-21 17:32:20 +01:00
philippe grand
c740a85006
[Qual] Uniformize code
2015-12-21 14:43:21 +01:00
philippe grand
8e8c6b1534
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-12-21 14:22:45 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Florian HENRY
8006baf592
ry
2015-12-21 13:09:22 +01:00
Laurent Destailleur
536413523a
Fix to show ref of linked object on documents. Fix is not complete but
...
stable.
2015-12-21 12:52:10 +01:00
Laurent Destailleur
fec5f4e20b
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-12-21 12:40:32 +01:00
Laurent Destailleur
0a515ca8c0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-12-21 12:38:23 +01:00
Laurent Destailleur
932c3f9172
Fix init of situation_percent
2015-12-21 12:37:58 +01:00
Laurent Destailleur
7e03aaee23
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-21 12:25:47 +01:00
Laurent Destailleur
96b6f0d8fb
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
composer.json
htdocs/product/ajax/products.php
htdocs/product/class/product.class.php
2015-12-21 12:24:24 +01:00
Laurent Destailleur
b179a193dd
Fix param for username is $username and not $login
2015-12-21 03:01:37 +01:00
Laurent Destailleur
a2ae9b9cfc
Fix forget password page must have a different title then login page
...
Fix Missing translations
2015-12-21 00:47:44 +01:00
Laurent Destailleur
2f8fc05cdb
Fix: QRcode must not be random
2015-12-20 21:28:05 +01:00
Laurent Destailleur
f243b5230f
Fix search filter disappear and clean filter button not visible.
2015-12-20 20:24:12 +01:00
Laurent Destailleur
fa277ef634
Fix duplicate translation
2015-12-20 20:11:29 +01:00
philippe grand
7a33e2983d
[Qual] Uniformize code
2015-12-20 10:36:20 +01:00
Laurent Destailleur
f0802eb36b
FIX #4245 PHP 7
2015-12-19 19:48:36 +01:00
Laurent Destailleur
1c1d176715
Fix statistics was reporting bad value
2015-12-19 19:39:42 +01:00
Laurent Destailleur
065b7b6683
Fix ba alignement
2015-12-19 19:12:21 +01:00
Laurent Destailleur
55e90c5676
Try to restore lost file
2015-12-19 18:35:17 +01:00
Laurent Destailleur
f5c5dfd37f
FIX #4185
2015-12-19 18:26:15 +01:00
Laurent Destailleur
3517b64031
FIX #4228 PHP7 error
2015-12-19 18:18:24 +01:00
Laurent Destailleur
9334cf8fd1
FIX #4243 sql injection
2015-12-19 18:03:08 +01:00
Laurent Destailleur
ba9796a438
Merge pull request #4082 from atm-maxime/fix_situation_percent
...
Fix : situation percent should be 100 by default
2015-12-19 17:49:04 +01:00
Laurent Destailleur
3b2a921378
Fix a serial is required for stock change
2015-12-19 14:05:38 +01:00
Laurent Destailleur
d7e9c92144
Fix bad link on category
...
Fix cancel button on categories
Css enhancement.
2015-12-19 13:55:27 +01:00
Laurent Destailleur
50e496712e
missing css style
2015-12-19 03:47:02 +01:00
Laurent Destailleur
bef971cacf
Fix ergonomy. Adding a new entry is done from left menu.
2015-12-19 03:43:45 +01:00
Laurent Destailleur
b1051c7396
Fix picto
2015-12-19 03:30:35 +01:00
Laurent Destailleur
a4edd90320
Debug the cron module
2015-12-19 03:27:55 +01:00
Laurent Destailleur
a973c91c24
Fix pagination on cron jobs
...
Fix perf when too much lines
2015-12-19 02:39:44 +01:00
Laurent Destailleur
bd91f327b8
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
.travis.yml
htdocs/filefunc.inc.php
2015-12-19 01:38:22 +01:00
Laurent Destailleur
298396a57e
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
test/phpunit/AllTests.php
2015-12-19 01:27:19 +01:00
Laurent Destailleur
0df45f10c1
Fix travis
2015-12-19 01:09:42 +01:00
Laurent Destailleur
a136e90749
Fix travis
2015-12-19 01:06:11 +01:00
Laurent Destailleur
f25a9030eb
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
2015-12-18 22:12:03 +01:00
Laurent Destailleur
dd3f5a32d3
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
.travis.yml
composer.json
htdocs/accountancy/admin/card.php
2015-12-18 21:20:12 +01:00
Laurent Destailleur
ebf68ecbe0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
.travis.yml
htdocs/contrat/class/contrat.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/project/pdf/pdf_baleine.modules.php
2015-12-18 21:03:57 +01:00
Laurent Destailleur
dc9c5ed5ef
Enhance transifex sync
2015-12-18 18:25:09 +01:00
Laurent Destailleur
1b67a9faf1
Merge pull request #4262 from atm-ph/fix_3.8_create_order_from_propal
...
FIX label of line is set in description field if empty
2015-12-18 18:21:20 +01:00
Laurent Destailleur
484dc5937b
Fix regression in sorting
2015-12-18 18:05:07 +01:00
Laurent Destailleur
43044bbb4f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-18 17:32:54 +01:00
Laurent Destailleur
eaacfabdf6
Merge pull request #4261 from hregis/3.8_bug
...
Fix: Disable "main.inc.php" hooks with ajax return
2015-12-18 17:32:45 +01:00
Laurent Destailleur
4998516835
Code comment
2015-12-18 17:31:50 +01:00
Laurent Destailleur
724817b966
Merge pull request #4259 from aschio/develop_sunimport
...
Adding extrafields to shipments module
2015-12-18 17:28:35 +01:00
Laurent Destailleur
dc8e5f45ae
Merge pull request #4254 from grandoc/develop
...
[Qual] Uniformize code
2015-12-18 17:13:22 +01:00
phf
c215898c52
FIX label of line is set in description field if empty
2015-12-18 17:11:14 +01:00
Laurent Destailleur
7af4d91828
Merge pull request #4251 from fmarcet/3.6
...
FIX: Not deleting contracts on element_element table
2015-12-18 17:07:42 +01:00
Laurent Destailleur
c328860af0
Merge pull request #4250 from GPCsolutions/dolibarr-4242
...
FIX #4242 Allow disabling dashes in documents
2015-12-18 17:07:00 +01:00
Laurent Destailleur
452feca64a
Merge pull request #4249 from GPCsolutions/3.8-4242
...
FIX #4242 Allow disabling dashes in documents
2015-12-18 17:06:51 +01:00
Laurent Destailleur
d0ec3f1152
Merge branch 'dolibarr-cifix' of
...
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-dolibarr-cifix
Conflicts:
htdocs/product/card.php
2015-12-18 17:05:04 +01:00
Regis Houssin
70354def7c
Fix: Disable "main.inc.php" hooks with ajax return
2015-12-18 13:27:51 +01:00
Laurent Destailleur
98cd4f8307
Fix message so it is more clear what the feature can do or not.
...
Fix list of email templates must be hidden for templates of disabled
modules.
2015-12-18 12:48:20 +01:00
cla
cb96618460
Merge branch 'develop' into develop_sunimport
2015-12-18 10:49:57 +01:00
Laurent Destailleur
b10f9d4ca3
Fix: when doing an export of extrafields, we must use different table
...
alias for each extrafield table.
2015-12-17 20:40:33 +01:00
Laurent Destailleur
5eea1ce7d9
Fix several warnings
2015-12-17 19:37:24 +01:00
philippe grand
6e45ad92fa
fix some issue within setEventMessages attribut
2015-12-17 17:35:30 +01:00
philippe grand
b91031b693
fix some issue within my last commit
2015-12-17 17:20:28 +01:00
Laurent Destailleur
5f4947e3c1
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-12-17 17:16:37 +01:00
Laurent Destailleur
cdc408a84c
Fix: button "now" was not working on date using no javascript
2015-12-17 17:16:26 +01:00
philippe grand
367d9de0b7
fix some translation
2015-12-17 17:12:28 +01:00
philippe grand
93845ffa69
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-12-17 16:58:05 +01:00
philippe grand
c9d6607b04
[Qual] Uniformize code
2015-12-17 14:14:44 +01:00
Laurent Destailleur
92343901d6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-17 14:01:34 +01:00
Laurent Destailleur
ba3c8de785
Update doc comment to make things cleaner to avoid confusion between old
...
deprecated doActions of canvas and doActions of triggers.
2015-12-17 14:01:22 +01:00
fmarcet
21f7271e51
FIX: Not deleting contrats on element_element table
2015-12-17 12:36:43 +01:00
Raphaël Doursenaud
4f9ab7da24
FIX #4242 Allow disabling dashes in documents
...
3.9 specific fix since document have moved
2015-12-17 10:39:55 +01:00
Raphaël Doursenaud
7e98cfd5b6
FIX #4242 Allow disabling dashes in documents
...
3.8 specific fix for new documents
2015-12-17 10:33:17 +01:00
Raphaël Doursenaud
02e053acc6
FIX #4242 Allow disabling dashes in documents
...
3.7 specific fix since document files have moved
2015-12-17 10:26:27 +01:00
Raphaël Doursenaud
e6ec797af8
FIX #4242 Allow disabling dashes in documents
2015-12-17 10:21:44 +01:00
Raphaël Doursenaud
c2642acdba
Fix CI build 578 (Syntax error)
...
empty() only supports variables in PHP < 5.5
2015-12-17 10:03:42 +01:00
Laurent Destailleur
34f4e913d4
Merge pull request #4240 from frederic34/patch-9
...
Fix when PRODUIT_MULTIPRICES is set, label for each level was not visible
2015-12-16 19:58:48 +01:00
Laurent Destailleur
9973315a07
Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
...
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
Laurent Destailleur
6133298e58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-16 19:27:23 +01:00
Laurent Destailleur
f87ccc97e2
Miscellaneous fixes
2015-12-16 19:26:50 +01:00
Laurent Destailleur
33ea5c83b7
Merge pull request #4238 from fappels/develop
...
Fix product list page offset calculation
2015-12-16 19:26:32 +01:00
Laurent Destailleur
acc4623b74
Merge pull request #4236 from defrance/patch-90
...
fix ErrorBadValueForParamNotAString shit one again...
2015-12-16 19:25:39 +01:00
Laurent Destailleur
609b8a8506
Merge pull request #4234 from aspangaro/develop-a3
...
Accountancy- Add a column in table bookkeeping to validate operations
2015-12-16 19:15:13 +01:00
Laurent Destailleur
7c1fc2fee1
Merge pull request #4233 from aspangaro/3.7-accountancy1
...
Fix: Accountancy Add an empty field for list of parent account - This value can be null
2015-12-16 19:14:45 +01:00
Laurent Destailleur
516e071363
Merge pull request #4232 from aspangaro/develop-remove_zero
...
New: Accountancy add a function to remove all zero at the right of the account
2015-12-16 19:13:43 +01:00
Laurent Destailleur
710a8bb6a9
Merge pull request #4231 from mrsof/patch-2
...
Typo
2015-12-16 19:11:24 +01:00
Laurent Destailleur
cd70b296c1
Merge pull request #4223 from fappels/develop-shipment-error-handling
...
Fix not complete output of error messages in shipment
2015-12-16 19:09:35 +01:00
Laurent Destailleur
d95be87e64
Merge pull request #4222 from grandoc/develop
...
Fix not complete output of error messages
2015-12-16 19:08:06 +01:00
Laurent Destailleur
7b17d2ce0c
Merge pull request #4221 from mrsof/patch-1
...
FIX : Fatal error: Cannot access empty property
2015-12-16 19:07:24 +01:00
Laurent Destailleur
b2640498c4
Merge pull request #4219 from bafbes/patch-10
...
Fix the list of thirdparty must be restricted to customer for invoices
2015-12-16 19:04:01 +01:00
Laurent Destailleur
77e9ab763b
Merge pull request #4216 from frederic34/patch-8
...
FIX option MAIN_DISABLE_FULL_SCANLIST was not working for stock movements
2015-12-16 19:02:53 +01:00
Laurent Destailleur
4ef832b94b
Merge pull request #4215 from frederic34/patch-7
...
Update sms.php
2015-12-16 19:02:07 +01:00
Frédéric FRANCE
9e6698c6ca
Update multiprix.php
2015-12-16 18:18:02 +01:00
Regis Houssin
c71d578931
Fix: for avoid division by 0
2015-12-16 16:39:50 +01:00
cla
1ebe6fb9b5
UPDATE:
...
sendings EN_US lang file
2015-12-16 16:21:05 +01:00
cla
ef487c48a4
NEW
...
Extrafields for:
- expedition, expeditiondet, livraison, livraisondet
2015-12-16 16:18:29 +01:00
Francis Appels
3568b889bf
Update list.php
...
Fix page offset calculation
2015-12-16 15:42:24 +01:00
Regis Houssin
cb7f29b332
Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context
2015-12-16 13:32:44 +01:00
BENKE Charlie
afe3e6ac27
fix ErrorBadValueForParamNotAString shit one again...
2015-12-16 12:38:32 +01:00
aspangaro
5cd5413836
Accountancy add a column in table bookkeeping to validate operations
2015-12-16 05:22:50 +01:00
aspangaro
dfbc2814e7
Fix: Add an empty field for list of parent account - This value can be null
2015-12-15 21:10:53 +01:00
aspangaro
36bc1321cb
Merge remote-tracking branch 'Upstream/develop' into develop-remove_zero
2015-12-15 20:50:49 +01:00
aspangaro
c1e77daeb1
New: Accountancy add a function to remove all zero at the right of the account.
...
Thanks to Florian
2015-12-15 20:48:06 +01:00
Laurent Destailleur
90dbfc4870
Fix: to avoid confusion between amount of payment and amount distributed
...
on invoice when a payment is done for several invoices, export of
payment can export both fields.
2015-12-15 15:52:20 +01:00
Sof
011f0fbb0b
FIX : Typo error
2015-12-15 14:04:52 +01:00
BENKE Charlie
23e727048e
Add some new translations for export feature
2015-12-15 10:35:11 +01:00
Laurent Destailleur
af85ade7ff
Minor css fix
2015-12-15 10:24:31 +01:00
Laurent Destailleur
3e3dbf850f
Fix: bad case for function
2015-12-15 09:44:17 +01:00
Laurent Destailleur
40269c3c70
Fix Remove syntax warnings
2015-12-15 09:43:39 +01:00
aspangaro
687370071b
A function to remove zero at the end of the account
2015-12-14 21:38:30 +01:00
fappels
9fa742ceb2
[QUAL] Shipment error handling
2015-12-14 21:38:26 +01:00
Laurent Destailleur
ed88a4c398
Fix css
2015-12-14 21:38:04 +01:00
philippe grand
0fe64c6091
[Qual] Uniformize code
2015-12-14 20:54:55 +01:00
Sof
4c60569cc4
FIX : Fatal error: Cannot access empty property
2015-12-14 15:42:21 +01:00
Bahfir Abbes
e415a3ddf2
Update facture.php
...
fix change customer function in customer invoices - include customers or prospects only
2015-12-14 15:01:29 +01:00
Laurent Destailleur
b9aa80c4ca
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-12-14 10:33:32 +01:00
Laurent Destailleur
84ee18a11b
Fix bad management of second level approvement
2015-12-14 10:33:18 +01:00
Frédéric FRANCE
af5bcc5312
Update mouvement.php
2015-12-14 09:31:40 +01:00
Laurent Destailleur
0ec62c05cc
Fix bad var name. Removed warning.
2015-12-14 09:14:34 +01:00
Raphaël Doursenaud
bbe7498de6
Better Travis CI
...
NEW:
Cleaned up routines for better readability of both declaration and results.
PHP versions now really covered.
The old code forced install of PHP and didn't use Travis provided versions.
This resulted in the process not being executed with the declared PHP version.
Dropped MySQL in favor of MariaDB.
This is now the FLOSS community standard.
This should help avoid problems with buggy MySQL releases.
Fast finish enabled to show results faster.
Optimized tools installation with composer.
The right version of the tool is installed for the PHP version under test.
New PHP linter to check for syntax errors.
Parallelized for better speed.
Apache + PHP FPM for testing webservices.
The previous mod_php configuration was not supported on Travis.
New global DEBUG environment variable to show verbose output with configuration files content.
IRC notification on #dolibarr@freenode for community awareness.
FIXES:
Bug in scripts preventing execution with environmentalized PHP.
Wrong detection of MAIN_URL_ROOT under specific circumstances.
$_SERVER["DOCUMENT_ROOT"] empty and $_SERVER["SCRIPT_NAME"] populated.
Relative ignore directive in coding style ruleset to avoid bypassing test.
Unit test errors without an exit status.
This prevented the CI from properly detecting and reporting the error.
TODOS:
PostgreSQL support.
This one is tricky since we only have a MySQL dump and the syntax is not directly compatible.
SQLite support.
Disabled in core at the moment.
Nginx + PHP FPM support.
Test webservices on the second most popular webserver.
Run dev/* checks.
We have a nice collection of scripts we could leverage.
Check Javascript.
Check CSS.
Check SQL.
2015-12-13 21:34:36 +01:00
Frédéric FRANCE
1aa232c4a7
Update CSMSFile.class.php
2015-12-13 21:14:53 +01:00
Frédéric FRANCE
65cebe37f3
Update sms.php
2015-12-13 21:12:08 +01:00
Laurent Destailleur
dc6ec91b2c
Merge pull request #4183 from IonAgorria/patch-3
...
JS error preventing hiding of dates at object line
2015-12-13 19:57:37 +01:00
Laurent Destailleur
c5054c41cf
Merge pull request #4211 from aspangaro/3.8-3879
...
Fix #3879 Wrong translation in the new expense report module
2015-12-13 19:56:55 +01:00
Laurent Destailleur
da8e38b253
Merge pull request #4213 from grandoc/develop
...
[Qual] Uniformize code
2015-12-13 19:56:43 +01:00
Laurent Destailleur
b949468b75
Merge pull request #4210 from IonAgorria/pricesel-fix
...
Price expression selector fix
2015-12-13 19:56:32 +01:00
Laurent Destailleur
4d11c8b733
Merge pull request #4212 from frederic34/patch-7
...
typo
2015-12-13 19:40:08 +01:00
Laurent Destailleur
646a198399
Merge pull request #4214 from frederic34/patch-8
...
typo
2015-12-13 19:39:56 +01:00
Laurent Destailleur
e37fc87cd5
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-13 17:34:06 +01:00
Laurent Destailleur
1978eebb69
Fix bad merge
2015-12-13 17:33:20 +01:00
Laurent Destailleur
ef13bd43b0
Fix bad merge
2015-12-13 17:27:55 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
Laurent Destailleur
7db6ac592f
FIX Option start tls of ldap was not correctly supported.
2015-12-13 15:51:52 +01:00
Laurent Destailleur
ef33691818
FIX Removed hard coded parameters for asterisk setup
2015-12-13 15:21:46 +01:00
Laurent Destailleur
3680202c1c
Fix do not share color for title of table and title of pages
2015-12-13 14:39:12 +01:00
Frédéric FRANCE
9cc77787c5
typo
2015-12-12 16:10:36 +01:00
Laurent Destailleur
2a6fbe3526
Fix debug shipment doc generation (bad position of fields, code
...
differences, text size, ...)
2015-12-12 14:55:32 +01:00
Laurent Destailleur
0330d8237f
Fix: Color too dark
2015-12-12 14:13:45 +01:00
Laurent Destailleur
84205b5be4
Fix: text too long
2015-12-12 14:12:53 +01:00
Laurent Destailleur
5f4be14dd2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-12 13:19:55 +01:00
philippe grand
de0a13ae8f
[Qual] Uniformize code
2015-12-12 10:59:02 +01:00
Frédéric FRANCE
442f669dc7
typo
2015-12-12 10:45:33 +01:00
aspangaro
c3acee56e2
Fix #3879 Wrong translation in the new expense report module
2015-12-12 10:06:11 +01:00
Ion Agorria
57102aefde
Price expression selector fix
2015-12-12 01:38:24 +01:00
Juanjo Menent
4b9e87367f
Merge pull request #4206 from grandoc/develop
...
[Qual] Close database handler should be after Footer
2015-12-11 21:35:14 +01:00
philippe grand
2cd49043a6
[Qual] Close database handler should be after Footer
2015-12-11 19:37:12 +01:00
Ion Agorria
26b85d7cac
Remove unnecesary variable
2015-12-11 18:28:55 +01:00
Laurent Destailleur
f71225742a
Merge pull request #4178 from GPCsolutions/dolibarr-3953
...
Better javascript rounding
2015-12-11 17:59:34 +01:00
Laurent Destailleur
519e022c98
Merge pull request #4191 from braito4/patch-1
...
Update list.php
2015-12-11 17:28:40 +01:00
Laurent Destailleur
da5aa0cd36
Merge pull request #4200 from GPCsolutions/dolibarr-php7
...
[Qual] OOP constructor
2015-12-11 17:26:08 +01:00
Laurent Destailleur
1a58624775
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-11 17:05:38 +01:00
Laurent Destailleur
47fce16778
Merge branch 'develop' of https://github.com/FHenry/dolibarr into
...
FHenry-develop
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-12-11 17:04:19 +01:00
Laurent Destailleur
8ac189a1c3
Merge pull request #4199 from grandoc/develop
...
[Qual] Uniformize code
2015-12-11 16:59:25 +01:00
Laurent Destailleur
793e6e2a8f
Example mut be excluded of packages
2015-12-11 16:56:25 +01:00
Laurent Destailleur
42436a37f4
Merge pull request #4194 from GPCsolutions/dolibarr-hidepass
...
[Security] Hide click to dial password
2015-12-11 16:46:04 +01:00
Laurent Destailleur
b85dd6647d
Merge pull request #4175 from frederic34/patch-3
...
Update paypal.lib.php
2015-12-11 16:44:25 +01:00
Laurent Destailleur
9c20694668
Merge pull request #4203 from frederic34/patch-5
...
Update CSMSFile.class.php
2015-12-11 16:39:51 +01:00
Laurent Destailleur
335530b496
Merge pull request #4189 from apachler/develop
...
added social charges for Austria
2015-12-11 16:39:16 +01:00
philippe grand
30eb08151d
[Qual] Close database handler should be after Footer
2015-12-11 14:19:38 +01:00
philippe grand
9b0dd8159e
[Qual] Close database handler should be after Footer
2015-12-11 12:29:19 +01:00
Florian HENRY
8edf3c65c6
work on accounting
2015-12-11 11:46:22 +01:00
Florian HENRY
71d0024b27
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-11 11:31:37 +01:00
philippe grand
8ccafc6e36
[Qual] Uniformize code
2015-12-11 09:54:30 +01:00
Ion Agorria
f34fb0d82d
More consistent check
2015-12-11 03:09:09 +01:00
Frédéric FRANCE
e193d9be97
Update CSMSFile.class.php
2015-12-10 23:08:21 +01:00
Raphaël Doursenaud
3e2309d0e6
NEW Factorized price2numjs into lib_head.js.php
...
Used public domain code from the MDN to provide a robust decimal
rounding implementation.
Warning for developers: the path of the javascript file has changed.
Please update your scripts.
2015-12-10 17:03:00 +01:00
Frédéric FRANCE
ac04fdbd9a
Update paypal.php
2015-12-10 16:49:55 +01:00
Raphaël Doursenaud
5aaafc3f8a
[Qual] OOP constructor
...
Using class name as constructor method is deprecated in PHP 7
2015-12-10 16:37:37 +01:00
Frédéric FRANCE
5f0c7b6c38
Update paypal.lang
2015-12-10 16:31:11 +01:00
Frédéric FRANCE
9bb9e6b787
Update paypal.php
2015-12-10 16:29:35 +01:00
Frédéric FRANCE
9e0817ac05
Update paypal.lib.php
2015-12-10 16:28:22 +01:00
philippe grand
fc8c12d6f6
[Qual] Uniformize code
2015-12-10 16:14:37 +01:00
Ion Agorria
ceb2920769
Better undefined CKEDITOR fix
2015-12-10 14:17:08 +01:00
Laurent Destailleur
3bcdc5c9c0
Merge pull request #4181 from grandoc/develop
...
[Qual] Uniformize code
2015-12-10 13:35:44 +01:00
Laurent Destailleur
dc2b5bd495
Merge pull request #4176 from GPCsolutions/dolibarr-composer
...
Updated libraries
2015-12-10 13:15:33 +01:00
Laurent Destailleur
aef427423f
Merge pull request #4174 from defrance/patch-86
...
db->close must be do after llx_footer
2015-12-10 13:08:55 +01:00
Laurent Destailleur
c497a5e526
Merge pull request #4171 from IonAgorria/fix-dateranges
...
Fix date handling for hours/mins in some pages
2015-12-10 13:08:30 +01:00
Laurent Destailleur
3e3a99ad5e
Merge pull request #4170 from openthink-laurent/fix-uniqueness-objects-reference
...
Fix uniqueness of objects reference
2015-12-10 13:07:16 +01:00
Andreas Pachler
019bc7ba8e
added austrian Regions, Departements, Forme Juridique and social charges to migration file from 3.8 to 3.9
2015-12-10 12:56:05 +01:00
Raphaël Doursenaud
4f359616ce
[Security] Hide click to dial password
2015-12-09 18:16:08 +01:00
Ion Agorria
bbfd138896
Missed another CKEDITOR ref
2015-12-09 18:00:05 +01:00
Florian HENRY
b80518efb4
fix travis
2015-12-09 14:26:04 +01:00
Raphaël Doursenaud
c0862762a5
Fix #3930 Removed executable bit
...
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
braito4
ab274ba1e3
Update list.php
...
Doble page title
2015-12-09 13:10:12 +01:00
Florian HENRY
96a95d6ae1
Debug accountancy on 3.9
2015-12-09 12:55:08 +01:00
Florian HENRY
ea1a81f5f4
FIX : Comptability when multiple account charts
2015-12-09 11:53:38 +01:00
Andreas Pachler
4885c64ab3
added social charges for Austria
2015-12-09 09:32:21 +01:00
BENKE Charlie
898f637457
Update fichinter.php
2015-12-08 18:02:25 +01:00
Ion Agorria
238f977002
JS error preventing hiding of dates at object line
...
The "if (CKEDITOR)" gives "ReferenceError: CKEDITOR is not defined" at JS console causing the next code to don't execute, is this code obsolete?
2015-12-08 15:45:24 +01:00
philippe grand
01c6728aa9
[Qual] Uniformize code
2015-12-08 11:35:08 +01:00
Raphaël Doursenaud
3f9efc537b
FIX #3953 Don't round supplier price
...
The price is already rounded when inserted on the product page.
It's also rounded at display.
There's no need to round it here.
Rounding it leads to serious calculation errors.
2015-12-07 14:35:04 +01:00
Raphaël Doursenaud
2cf36d157f
FIX #3953 Don't round supplier price
...
The price is already rounded when inserted on the product page.
It's also rounded at display.
There's no need to round it here.
Rounding it leads to serious calculation errors.
2015-12-07 14:24:24 +01:00
Raphaël Doursenaud
9257bfc5df
Updated mobiledetect to 2.8.17
2015-12-07 13:53:59 +01:00
Raphaël Doursenaud
5dfa9ba369
Updated TCPDF to 6.2.12
2015-12-07 13:39:45 +01:00
Frédéric FRANCE
9d0f096e47
Update paypal.lib.php
2015-12-07 11:46:47 +01:00
BENKE Charlie
bcf6c1243c
db close must do AFTER llxFooter() call
2015-12-07 11:03:27 +01:00
BENKE Charlie
63fd4cd6c0
db close must do AFTER llxFooter() call
2015-12-07 11:01:48 +01:00
BENKE Charlie
c60178c95f
db close must do AFTER llxFooter() call
2015-12-07 11:00:26 +01:00
BENKE Charlie
771f7183d4
db close must do AFTER llxFooter() call
2015-12-07 10:56:37 +01:00
Ion Agorria
1dc5854535
Fix date handling for hours/mins in some pages
2015-12-07 03:59:03 +01:00
Laurent Léonard
05234390f2
Fix uniqueness of objects reference
2015-12-07 02:02:03 +01:00
Laurent Léonard
7e31c8f38f
Fix decimals in payments of supplier invoices
2015-12-07 01:27:08 +01:00
Laurent Destailleur
a209d18649
FIX Can use formated float number on old expense report module.
2015-12-06 19:51:28 +01:00
Laurent Destailleur
9bf7f5a78b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-06 19:45:04 +01:00
Laurent Destailleur
984068c136
Fix length of password too low (password was truncated making them
...
inoperent)
2015-12-06 19:17:39 +01:00
Laurent Destailleur
5710bcd38a
Merge pull request #4165 from AlainRnet/patch-2
...
Update const.php
2015-12-06 14:46:15 +01:00
Laurent Destailleur
f73c059bc4
Merge pull request #4159 from belyas/develop
...
addLogCP and updateSoledCP methodes throwing warnings when assigning leave for a user
2015-12-06 14:44:46 +01:00
Laurent Destailleur
939a36428c
Merge pull request #4156 from grandoc/develop
...
[Qual] Uniformize code
2015-12-06 14:42:58 +01:00
Laurent Destailleur
2aca50f7f8
Removed useless string
2015-12-06 13:56:15 +01:00
Laurent Destailleur
9c227d154e
Clean duplicate translation key
2015-12-06 13:37:48 +01:00
Laurent Destailleur
7f3531a04c
Enhance script to track duplicate translation string and use it to
...
remove around 50 duplicates.
2015-12-06 13:34:57 +01:00
Laurent Destailleur
d4268c079f
Fix syntax error
2015-12-06 12:23:49 +01:00
Laurent Destailleur
0279e99b0a
Update warning for mysql 5.5.4* bug
2015-12-06 12:04:34 +01:00
AlainRnet
50cf96bd16
Update const.php
...
link to help file
2015-12-06 12:01:59 +01:00
Laurent Destailleur
745875d21e
NEW Can choose fields to show on project list
2015-12-06 01:19:27 +01:00
Laurent Destailleur
374480043e
Add maxwidth300 on combo list for users and sale representatives
2015-12-06 00:37:58 +01:00
Laurent Destailleur
497c30d994
NEW Add thumb of users into thumbs stats on home page
2015-12-05 19:38:45 +01:00
Laurent Destailleur
9d3451b31d
NEW Add thumb of users into thumbs stats on home page
2015-12-05 19:31:32 +01:00
Laurent Destailleur
ff4f1e7a5b
Debug 3.9
2015-12-05 19:20:39 +01:00
Laurent Destailleur
e002021d7d
Fix td balance
2015-12-05 17:49:08 +01:00
yassine belkaid
8c22274300
Fixed assigning exceptional leave for a user
2015-12-05 00:41:00 +00:00
yassine belkaid
1075940e93
ignore conf/conf.php file
2015-12-05 00:37:32 +00:00
Laurent Destailleur
4a2bda3491
Look enhancement
2015-12-04 23:25:34 +01:00
philippe grand
f640486c8b
[Qual] Uniformize code
2015-12-04 22:50:03 +01:00
Laurent Destailleur
5cd43d2df0
Some debug on new features
2015-12-04 20:51:34 +01:00
philippe grand
94fe00fe8d
[Qual] Uniformize code
2015-12-04 19:45:39 +01:00
Laurent Destailleur
eb795a7a9d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-04 18:39:39 +01:00
Laurent Destailleur
c91aa0aa90
Merge pull request #4154 from GPCsolutions/dolibarr-md-icons
...
Material Design icons
2015-12-04 18:39:26 +01:00
Laurent Destailleur
8c03e46a83
Removed a TODO
2015-12-04 18:33:57 +01:00
Laurent Destailleur
b169b976b7
Merge pull request #4152 from GPCsolutions/dolibarr-md
...
Fixed md theme name
2015-12-04 18:30:01 +01:00
Laurent Destailleur
d0d7e83929
Merge pull request #4149 from GPCsolutions/dolibarr-php7
...
[Qual] OOP detection of PHP MySQL driver
2015-12-04 18:25:14 +01:00
Laurent Destailleur
6542da404e
Merge pull request #4129 from aspangaro/develop-bank
...
New HRM Add bank tab in user to pay salary or expense report
2015-12-04 18:23:47 +01:00
Raphaël Doursenaud
87d6a5926b
Fixed md theme name
2015-12-04 18:05:04 +01:00
Raphaël Doursenaud
a8f67808de
NEW Used matching icons for Material Design theme
...
Icons from https://www.google.com/design/icons/
Licenced under CC BY 4.0
2015-12-04 18:04:41 +01:00
Raphaël Doursenaud
1dfd3f396e
Fixed md theme name
2015-12-04 18:04:41 +01:00
Florian HENRY
955fad910d
FIX : Bug: $this is not accessible in static context in
...
Mailing::libStatutDest #4050
2015-12-04 17:32:17 +01:00
Laurent Destailleur
bcadc33e31
Debug visibility on task/projects
2015-12-04 15:37:28 +01:00
aspangaro
6598ac6745
Add rights to see tab (hrm->employee->read)
2015-12-04 12:48:36 +01:00
aspangaro
c30728326e
Merge remote-tracking branch 'Upstream/develop' into develop-bank
2015-12-04 12:41:51 +01:00
Laurent Destailleur
e6ebc9c293
More complete tooltip help
2015-12-04 12:24:36 +01:00
Laurent Destailleur
a24cbf5585
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-04 12:12:23 +01:00
Laurent Destailleur
4dd1cb3e77
Theme MD looks ready for 3.9 now.
2015-12-04 12:12:12 +01:00
Laurent Destailleur
2b149aa514
Merge pull request #4148 from AlainRnet/develop
...
Update fraise.modules.php
2015-12-04 10:31:34 +01:00
Laurent Destailleur
53a8cb4475
Merge pull request #4130 from bafbes/develop
...
add constant FICHINTER_EMPTY_LINE_DESC to allow empty line descriptions in interventions
2015-12-04 10:30:51 +01:00
Laurent Destailleur
7d7a978ba0
Merge pull request #4145 from FHenry/3.8
...
FIX : Contract date inconsistency between /comm/card.php and #4089
2015-12-04 10:25:50 +01:00
Raphaël Doursenaud
b45d4a2a51
[Qual] OOP detection of PHP MySQL driver
2015-12-03 22:31:13 +01:00
AlainRnet
ebc1105b5c
Update fraise.modules.php
...
following discussion with eldy (https://github.com/Dolibarr/dolibarr/pull/4079#issuecomment-161601400 ) to mix a french forum membre to select mailing member by type, I try to update this selector to integrate selection by type.
Thanks in advance for feedback
2015-12-03 21:09:09 +01:00
Bahfir Abbes
fb692f4cd5
Update card.php
2015-12-03 19:10:15 +01:00
Laurent Destailleur
43ab23ca28
Fix doxygen
2015-12-03 14:54:39 +01:00
Laurent Destailleur
6be9a04a56
Fix detection of last version on sourceforge
2015-12-03 14:52:13 +01:00
Laurent Destailleur
e4f0b9ba15
Fix detection of last version on sourceforge
2015-12-03 14:46:34 +01:00
fmarcet
eb98bd1e78
FIX: Not delete a product when have customer price
2015-12-03 14:02:26 +01:00
Laurent Destailleur
1658bee81c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-03 13:06:37 +01:00
Laurent Destailleur
480a398f36
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/holiday/card.php
htdocs/resource/list.php
2015-12-03 13:06:20 +01:00
Laurent Destailleur
12702ee128
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/report.lib.php
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:59:13 +01:00
Florian HENRY
3dec67ffdf
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-12-03 12:58:39 +01:00
Laurent Destailleur
7105fabb79
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:51:49 +01:00
Laurent Destailleur
64e35255ae
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-12-03 12:47:32 +01:00
Laurent Destailleur
a7d03af4af
Fix sending emails from mergepedtool was just doing wrong things.
2015-12-03 12:47:21 +01:00
Laurent Destailleur
6763b5baa0
Merge pull request #4144 from FHenry/develop
...
FIX : Cannot change the date of a contract #4088
2015-12-03 12:06:48 +01:00
Laurent Destailleur
c088de517e
Merge pull request #4140 from GPCsolutions/dolibarr-sql
...
[Qual] More robust sorting
2015-12-03 12:06:01 +01:00
Laurent Destailleur
540609d5ed
Merge pull request #4139 from bafbes/patch-9
...
Update products.lang - include translation for units key in product/card.php
2015-12-03 12:01:10 +01:00
Laurent Destailleur
6b3e20dcdc
Merge pull request #4138 from GPCsolutions/dolibarr-4137
...
Fix #4137 Salaries parameter saving
2015-12-03 12:00:47 +01:00
Laurent Destailleur
1694481df8
Merge pull request #4134 from FHenry/3.7
...
FIX : Use "WHERE true" instead of "WHERE 1" #4132
2015-12-03 11:58:23 +01:00
Laurent Destailleur
c86d4b51b1
Merge pull request #4133 from ricardomm85/3.8
...
minor fix accessing $db
2015-12-03 11:57:25 +01:00
Florian HENRY
10a925f7b4
FIX: WHERE 1=1
2015-12-03 11:52:41 +01:00
Laurent Destailleur
63879c1ca6
Merge pull request #4122 from mrsof/patch-7
...
FIX: Cannot set property '_renderItem of undefined
2015-12-03 11:52:30 +01:00
Laurent Destailleur
7bad058f47
Merge pull request #4114 from fappels/3.8_fix_round_buyprice
...
FIX #3953 rounding of buying price
2015-12-03 11:48:09 +01:00
Florian HENRY
ee08c4afc4
Display the ref_supplier inside the contract list of /comm/card.php
...
#4090
2015-12-03 11:03:40 +01:00
Florian HENRY
b4160c7f81
Cannot change the date of a contract #4088
2015-12-03 10:58:06 +01:00
Florian HENRY
33e73afda6
FIX : Cannot change the date of a contract #4088
2015-12-03 10:51:03 +01:00
Florian HENRY
281eaf2987
FIX : Use "WHERE true" instead of "WHERE 1" #4132
2015-12-03 10:27:23 +01:00
Laurent Destailleur
cb8227f086
Fix syntax error
2015-12-03 10:04:13 +01:00
Laurent Destailleur
2f02919c70
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-03 10:01:51 +01:00
Laurent Destailleur
c664a492e6
Removed a not used field making mysql error (reserved word). Also this
...
field is not required by dolibarr core.
2015-12-03 10:01:40 +01:00
Laurent Destailleur
055e650adf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-02 23:23:38 +01:00
Laurent Destailleur
9aaab2c1dc
Work on select fields on project list
2015-12-02 23:20:19 +01:00
Laurent Destailleur
574b270da0
Work on the "mass action" feature. Can run mass action on
...
result of a select.
2015-12-02 22:00:39 +01:00
Raphaël Doursenaud
0c5c762c1c
[Qual] More robust sorting
...
Only allow valid values and discard others.
Do not use user supplied data in SQL query.
2015-12-02 21:15:59 +01:00
Bahfir Abbes
7841c97387
Update products.lang
2015-12-02 19:34:02 +01:00
Bahfir Abbes
134adcf637
Update products.lang
2015-12-02 18:55:51 +01:00
Raphaël Doursenaud
e1d5b4483a
Fix #4137 Salaries parameter saving
...
Button was outside of the form.
2015-12-02 18:31:38 +01:00
Florian HENRY
bd632cf2b0
FIX : Use "WHERE true" instead of "WHERE 1" #4132
2015-12-02 12:12:26 +01:00
ricardomm
eb504ffacc
minor fix accessing $db
2015-12-02 11:53:23 +01:00
Bahfir Abbes
5360ea65bf
Update card.php
2015-12-01 21:26:04 +01:00
aspangaro
e1c8e6d8f6
Remove useless code
2015-12-01 20:27:29 +01:00
aspangaro
09a6cc9625
wrong table
2015-12-01 20:17:14 +01:00
abb
46611908ae
add constant FICHINTER_EMPTY_LINE_DESC to allow empty line descriptions in interventions
2015-12-01 11:10:05 +01:00
aspangaro
882b66c586
HRM - Add bank tab in user to pay salary or expense report
2015-12-01 06:56:26 +01:00
Laurent Destailleur
6df4948a73
Fix text
2015-12-01 03:12:12 +01:00
Laurent Destailleur
357bc7a00c
Fix color link
2015-11-30 21:40:14 +01:00
Laurent Destailleur
de730c9762
NEW Introduce cost price on product.
2015-11-30 21:20:45 +01:00
aspangaro
b1122b55d4
Fix : accountancy code on finance journal is not a constant
2015-11-30 21:07:27 +01:00
Sof
daa8399764
FIX: Cannot set property '_renderItem of undefined
...
http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html
2015-11-30 20:31:42 +01:00
Sof
292d3ba959
FIX: Cannot set property '_renderItem of undefined
...
http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html
2015-11-30 20:28:36 +01:00
Laurent Destailleur
d6d2a2fadb
Merge pull request #4118 from patas-monkey/patch-1
...
Progress column not wide enough for 100%
2015-11-30 19:16:54 +01:00
Laurent Destailleur
62634a1db8
Merge pull request #4115 from mrsof/patch-3
...
FIX: Multiple syntax errors
2015-11-30 19:14:37 +01:00
Laurent Destailleur
863f81160f
Merge pull request #4116 from IonAgorria/patch-2
...
Only print : when both $h and $m are set
2015-11-30 18:54:50 +01:00
Sof
09b61fd185
Update extrafields.class.php
2015-11-30 18:06:15 +01:00
Sof
5dab92836b
FIX: Warning: implode(): Invalid arguments passed
...
Declare array type before implode to avoid warning
2015-11-30 12:27:58 +01:00
Romain DESCHAMPS
94101412e9
Progress column not wide enough for 100%
...
Progress column not wide enough for 100%
2015-11-30 12:20:14 +01:00
Laurent Destailleur
a12e959833
Do not show billed status after order status
2015-11-29 16:33:50 +01:00
Ion Agorria
d518b24d55
Only print : when both $h and $m are set
2015-11-29 16:19:30 +01:00
Sof
1b62cd4481
FIX: Multiple syntax errors
2015-11-29 16:05:14 +01:00
Laurent Destailleur
c55d11869b
Billing of supplier or customer order is a process that can be done in
...
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
fappels
4a0ea97772
FIX #3953 rounding of buying price
...
fix javascript for rounding of buying price
2015-11-29 15:34:43 +01:00
Laurent Destailleur
bb627e32d3
Fix: Form should use POST. GET has too much bad side effects.
2015-11-29 14:09:22 +01:00
Laurent Destailleur
b0e938fab4
Fix missing td cell
2015-11-29 13:15:02 +01:00
Laurent Destailleur
480623a6d5
Uniformize GUI. All lists must have a search on status at end and last
...
column is dedicaded to future "mass action checkbox".
2015-11-29 13:03:46 +01:00
Laurent Destailleur
b2a2f5b449
Merge pull request #4110 from frederic34/patch-5
...
Update list.php
2015-11-29 02:01:20 +01:00
Laurent Destailleur
bbece06b8e
Merge pull request #4109 from frederic34/patch-3
...
Navigation to loan list
2015-11-29 02:01:02 +01:00
Laurent Destailleur
ebe4867ab1
Remove useless information tomake screen lighter
2015-11-29 01:23:41 +01:00
Laurent Destailleur
263be5aa0a
Avoid 2 lines on mall screen
2015-11-29 01:16:56 +01:00
Laurent Destailleur
7b6d8dd23e
Fix for smartphone
2015-11-29 01:13:23 +01:00
Frédéric FRANCE
79263d06e9
Update index.php
2015-11-28 20:37:09 +01:00
Frédéric FRANCE
6d7e360498
Update list.php
2015-11-28 20:33:18 +01:00
Laurent Destailleur
5df193ec93
Uniformize code
2015-11-28 20:25:50 +01:00
Laurent Destailleur
5d5cfd498a
Add holiday date functions into PHPUnit
2015-11-28 19:54:16 +01:00
Frédéric FRANCE
e3443365d2
Navigation to loan list
2015-11-28 19:08:52 +01:00
Laurent Destailleur
acbbb70c44
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-28 17:36:02 +01:00
Laurent Destailleur
3e403720e6
FIX User is selected when choosing menu "My projects"
...
Graph of opportunities is moved into an include file.
2015-11-28 17:35:52 +01:00
Laurent Destailleur
d00ebd54f9
Merge pull request #4107 from aspangaro/develop-member
...
Fix adherent width colomn of create type form
2015-11-28 16:32:34 +01:00
Laurent Destailleur
fcdb3af708
Merge pull request #4106 from aspangaro/develop-skype
...
New: Better integration of skype for dolibarr 3.9
2015-11-28 16:31:35 +01:00
Laurent Destailleur
e6806611a6
Merge pull request #4105 from atm-ph/fix_38_select_projects_list
...
FIX jquery select of project generate js error on change event
2015-11-28 16:30:21 +01:00
Laurent Destailleur
e72f4cb063
Merge pull request #4102 from fmarcet/3.6
...
Fix: Bug when idprof is mandatory on thrid creation and we use multicompany
2015-11-28 16:27:16 +01:00
Laurent Destailleur
2ce00b2956
Merge pull request #4099 from GPCsolutions/3.6-4097
...
FIX #4097 Public holiday calculation
2015-11-28 16:11:28 +01:00
Laurent Destailleur
5b22eee938
FIX #4099
2015-11-28 16:11:15 +01:00
Laurent Destailleur
3485e351a4
Fix do not jump to top of page when clicking on "Link to order"
2015-11-28 15:46:20 +01:00
Laurent Destailleur
826c4de26b
Uniformize and debug module expense report.
2015-11-28 15:28:59 +01:00
aspangaro
8bf66d2f58
Remove skype also in member card - already present in dol_banner
2015-11-28 15:09:08 +01:00
aspangaro
0a3ab4617c
Fix adherent width colomn of create type form
2015-11-28 14:52:13 +01:00
aspangaro
d12e3ca91f
Finish work on better integration of skype
2015-11-28 14:43:16 +01:00
Laurent Destailleur
88e76dcf64
Fix utf8 encoded twice
2015-11-28 14:40:23 +01:00
phf
cbcb79b1eb
FIX jquery select of project generate js error on change event
2015-11-27 16:58:28 +01:00
Frédéric FRANCE
e6033369a8
Update resource.class.php
2015-11-26 20:33:07 +01:00
Frédéric FRANCE
1b9039af36
Update list.php
2015-11-26 20:30:11 +01:00
fmarcet
208bf2545f
Fix: Bug when idprof is mandatory on thrid creation and we use
...
multicompany
2015-11-26 17:14:03 +01:00
aspangaro
9817ce8b20
Merge remote-tracking branch 'Upstream/develop' into develop-skype
2015-11-26 07:12:04 +01:00
aspangaro
cb6038e125
Better code for admin skype
2015-11-26 07:10:13 +01:00
aspangaro
37da315af6
Remove old code
2015-11-26 06:30:09 +01:00
aspangaro
9a2259c681
Correct button 'Export' and 'Write bookkeeping' on finance journal
2015-11-26 06:19:24 +01:00
Laurent Destailleur
a6d8f943df
Fix several bugs into leave requets module
2015-11-26 02:12:37 +01:00
Laurent Destailleur
b47dbc7a5f
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/install/pgsql/functions/functions.sql
htdocs/projet/element.php
2015-11-26 01:32:21 +01:00
Laurent Destailleur
f814bc11a0
Clean packaging
2015-11-26 01:27:59 +01:00
Laurent Destailleur
1608fec937
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-26 00:47:29 +01:00
Laurent Destailleur
f353464bce
Prepare code to fix #4095
2015-11-26 00:47:17 +01:00
Laurent Destailleur
a1a5eba2de
Merge pull request #4096 from braito4/patch-1
...
Part solution bug #4095
2015-11-26 00:34:04 +01:00
Laurent Destailleur
a454e92656
Increase size of combo list
2015-11-26 00:31:12 +01:00
Laurent Destailleur
bc6d04e495
Typo
2015-11-26 00:08:34 +01:00
Laurent Destailleur
ddd0f8224f
Picto was not visible onto login page, we keep this behaviour.
2015-11-26 00:08:24 +01:00
Laurent Destailleur
02ac828e4c
Merge pull request #4075 from GPCsolutions/dolibarr-4074
...
Fix #4074 Properly save user theme settings
2015-11-25 23:51:30 +01:00
Laurent Destailleur
f79aeeeb0b
Merge pull request #4068 from aspangaro/develop-accountancy
...
Fix: typo on finance journal
2015-11-25 23:33:29 +01:00
Laurent Destailleur
8746ee1310
Merge pull request #4067 from aspangaro/develop-donation
...
NEW: Donation complete cerfa 11580*03 Fr - Thanks Benoit21
2015-11-25 23:33:13 +01:00
Laurent Destailleur
9d10533f3d
Merge pull request #4066 from aspangaro/develop-hrm
...
Fix: Auguria Menu & wrong table in dictionary HRM
2015-11-25 23:32:36 +01:00
Laurent Destailleur
ad087a75e6
Fix missing php
2015-11-25 23:32:00 +01:00
Laurent Destailleur
66a1becbf9
Merge pull request #4065 from frederic34/patch-5
...
Typo
2015-11-25 23:21:39 +01:00
Laurent Destailleur
2d8c2221d8
NEW Provide an easier way to understand if an order can be shipped.
2015-11-25 23:20:41 +01:00
Laurent Destailleur
28c77cbb49
Merge pull request #3994 from frederic34/patch-3
...
Not shippable if quantity in all order are greater than in stock
2015-11-25 22:26:15 +01:00
Laurent Destailleur
1caf148dc6
Merge pull request #4053 from marcosgdf/bug-3987
...
FIX #3987 Undefined variable $newref in CommandeFournisseur::approve
2015-11-25 22:24:56 +01:00
Laurent Destailleur
c8da4ee9f3
Merge pull request #4058 from marcosgdf/bug-3293
...
FIX #3293 Login page form icons not shown
2015-11-25 22:18:00 +01:00
aspangaro
8c0dffd24e
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
2015-11-25 20:23:41 +01:00
aspangaro
3457a732f5
New: Better integration of skype
2015-11-25 20:19:18 +01:00
Raphaël Doursenaud
973e42d10f
FIX #4097 Public holiday calculation
...
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
2015-11-25 19:34:11 +01:00
braito4
677cba01ce
Part solution bug #4095
...
It allow us to deactivate the link to a project queries to lower the page workload.
2015-11-25 18:58:47 +01:00
Laurent Destailleur
1d9e9ccaba
NEW Add filter on status on shipments
2015-11-25 17:34:26 +01:00
Laurent Destailleur
cf98c7a6f5
Police plus grande
2015-11-25 17:11:08 +01:00
Laurent Destailleur
2593022684
Fix bad css
2015-11-25 16:45:25 +01:00
Laurent Destailleur
5568ff1c54
Fix bad picto on export
2015-11-25 16:41:40 +01:00
Marcos García
a30f7d543a
Corrected fix
2015-11-25 10:19:11 +01:00
Raphaël Doursenaud
91ce70a6e9
FIX #4081 Added missing translation
2015-11-23 17:25:10 +01:00
Maxime Kohlhaas
da51a28766
Fix : situation percent should be 100 by default
2015-11-23 17:22:29 +01:00
Raphaël Doursenaud
231196437c
Fix #4074 Properly save user theme settings
2015-11-23 14:21:25 +01:00
Laurent Destailleur
a1824955f6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-23 12:21:02 +01:00
Laurent Destailleur
12358c9721
FIX The import help was not visible on calculated fields
2015-11-23 12:20:43 +01:00
Laurent Destailleur
61b46352b7
Dash line was not visible.
2015-11-23 09:36:34 +01:00
aspangaro
0899e7392b
Fix: typo on finance journal
2015-11-22 22:11:22 +01:00
aspangaro
71189248d9
Correct description
2015-11-22 21:35:19 +01:00
aspangaro
5bed70b04e
New: Donation complete cerfa 11580*03 Fr - Thanks Benoit21
2015-11-22 21:31:05 +01:00
aspangaro
f9e82721d7
Fix: Auguria Menu & wrong table in dictionary HRM
2015-11-22 20:13:48 +01:00
Frédéric FRANCE
3d05b53a62
Typo
2015-11-22 19:08:38 +01:00
Laurent Destailleur
ffeae34f51
Update doc
2015-11-22 18:41:35 +01:00
Laurent Destailleur
0c958521ac
Fix cleaning of lines was not working
2015-11-22 17:46:25 +01:00
Laurent Destailleur
73bcc3bfe3
The temp dir for cache used by rester is correctly managed: No temp or
...
data files must be stored outside of documents directory.
2015-11-22 17:39:13 +01:00
Laurent Destailleur
296e04022f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-22 17:19:45 +01:00
Laurent Destailleur
99fa751edc
Test lib is available
2015-11-22 17:19:20 +01:00
Laurent Destailleur
3c55479705
Restler #3544
2015-11-22 17:17:06 +01:00
Laurent Destailleur
3aa25cd2be
Merge pull request #4064 from frederic34/escpos
...
Add profile escpos printer
2015-11-22 17:09:15 +01:00
Laurent Destailleur
91f1acd1f1
Merge pull request #4063 from grandoc/develop
...
fix : Typo and translation
2015-11-22 17:07:22 +01:00
Laurent Destailleur
3f87b30327
Use same way to obfuscate key than password
2015-11-22 14:21:12 +01:00
frederic34
6b4b70bdbb
translations and help
2015-11-22 14:11:33 +01:00
Laurent Destailleur
a94aedb171
Minor css fix
2015-11-22 12:33:56 +01:00
Laurent Destailleur
cb3765bc92
Debug module Resource
2015-11-22 12:23:10 +01:00
Laurent Destailleur
e438d76df9
NEW Option encrypt password into databae is set to on by default on
...
first install.
2015-11-22 11:32:31 +01:00
frederic34
bfd97d5226
Add profile escpos printer
2015-11-22 11:04:27 +01:00
philippe grand
f4c8b5e7f8
missing translation
2015-11-22 10:46:17 +01:00
philippe grand
210c6c67cd
better translation and missing translation
2015-11-22 10:40:04 +01:00
philippe grand
9cdf0f427e
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-11-22 10:15:57 +01:00
Laurent Destailleur
c7447b0899
Add thirdparty of project into project summary of project home page.
...
Total use a different color
2015-11-21 20:25:28 +01:00
Laurent Destailleur
6f7a3f2c66
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-21 20:00:50 +01:00
Laurent Destailleur
e3c6e4ebe5
NEW Add planned workload and declared progress on project summary list
...
on project home page (data aggregated from tasks of project)
2015-11-21 20:00:38 +01:00
philippe grand
0408e309f8
fix : Typo and translation
2015-11-21 19:13:34 +01:00
Laurent Destailleur
7b0a9fabab
FIX Order last name / firstname in user list must be done according to
...
option
2015-11-21 18:26:25 +01:00
Laurent Destailleur
7bde781206
Merge pull request #4061 from marcosgdf/bug-3231
...
FIX #3231 [Members] Public subscription page displays GeoIP error
2015-11-21 17:58:29 +01:00
Laurent Destailleur
c8cf06c14b
Merge pull request #4059 from fappels/develop_fix_defineBuyPrice
...
Fix defineBuyPrice no min price is not error
2015-11-21 17:53:59 +01:00
Laurent Destailleur
dc6496fdf3
Merge pull request #4054 from marcosgdf/bug-3508
...
FIX #3508 Useless tooltip in 3.8 boxes
2015-11-21 17:49:09 +01:00
Laurent Destailleur
4481c4f978
Merge pull request #4052 from marcosgdf/bug-4049
...
FIX #4049 PHP warning when trying to access a non-existing product/service
2015-11-21 17:47:03 +01:00
Laurent Destailleur
295d83001a
Merge pull request #4051 from marcosgdf/bug-4018
...
FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined
2015-11-21 17:46:26 +01:00
Laurent Destailleur
54b6ff02c0
Merge pull request #4048 from FHenry/3.8
...
FIX Missing fields managed by update_customer_modtime in 3.8
2015-11-21 17:46:02 +01:00
philippe grand
e78794cab2
[Qual] Uniformize code
2015-11-21 17:38:09 +01:00
philippe grand
55bab28b9c
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-11-21 17:15:56 +01:00
Laurent Destailleur
c15c0f6fbb
Minor css fix
2015-11-21 15:31:27 +01:00
Laurent Destailleur
548ff26628
Focus on textarea works also when ckeditor is on
2015-11-21 13:42:01 +01:00
Marcos García de La Fuente
a456d21249
FIX #3231 [Members] Public subscription page displays GeoIP error
2015-11-21 13:25:09 +01:00
Laurent Destailleur
2a345b6fc0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
fappels
ecd3114683
Fix defineBuyPrice no min price is not error
...
No min buy price is not error, return 0 if no buyprice set
2015-11-21 12:35:45 +01:00
Laurent Destailleur
758b8e1f7e
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/boxes/box_project.php
2015-11-21 12:32:03 +01:00
Laurent Destailleur
c04743aa84
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-11-21 12:23:51 +01:00
Marcos García de La Fuente
3fbe10a578
FIX #3293 Login page form icons not shown
2015-11-21 12:18:29 +01:00
Marcos García de La Fuente
9f27e2323f
FIX #3734 Do not show empty links of deleted source objects in stock movement list
2015-11-21 11:51:23 +01:00
Marcos García de La Fuente
4bf6cf4e65
FIX #3508 Useless tooltip in 3.8 boxes
2015-11-21 11:24:18 +01:00
Marcos García de La Fuente
e8fc5f0d3a
FIX #3987 Undefined variable $newref in CommandeFournisseur::approve
2015-11-21 11:00:56 +01:00
Marcos García de La Fuente
eba5832d3a
FIX #4049 PHP warning when trying to access a non-existing product/service
2015-11-21 10:58:58 +01:00
Marcos García de La Fuente
e31a8f25a2
FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined
2015-11-21 10:55:23 +01:00
Florian HENRY
c0d29d2a15
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-21 10:10:42 +01:00
philippe grand
32f420eefa
[Qual] Uniformize code
2015-11-21 05:20:08 +01:00
philippe grand
928c44b04f
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-11-21 04:52:19 +01:00
Laurent Destailleur
69757210ce
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-21 02:40:21 +01:00
Laurent Destailleur
2eba3c9e81
Comment
2015-11-21 02:39:49 +01:00
Laurent Destailleur
30f0b6e2e8
Merge pull request #4046 from marcosgdf/bug-4016
...
FIX #4016 User link is not correctly formed in emailing receivers
2015-11-21 02:14:08 +01:00
Laurent Destailleur
94fdff9a46
Merge pull request #4045 from marcosgdf/bug-4043
...
FIX #4043 Incorrect translation in error mesage in menu creation admin page
2015-11-21 02:08:55 +01:00
Laurent Destailleur
bfaa8d539f
Merge pull request #4039 from frederic34/patch-9
...
typo
2015-11-21 01:51:56 +01:00
Laurent Destailleur
60724df496
Merge pull request #4038 from atm-maxime/develop
...
NEW add info page on product card
2015-11-21 01:51:32 +01:00
Laurent Destailleur
9db71098ac
Merge pull request #4031 from FHenry/develop
...
PG SQL
2015-11-21 01:50:47 +01:00
Laurent Destailleur
1bea9917c4
Introduce version on resource link, so no cache effect after upgrading
2015-11-21 00:52:20 +01:00
Laurent Destailleur
a79e8d33f1
FIX Bad meteo icon
2015-11-21 00:43:35 +01:00
Laurent Destailleur
97dc4c346b
Merge pull request #4026 from aspangaro/develop-hrm
...
New: FR #3699 HRM Add address informations in user card
2015-11-21 00:27:29 +01:00
Laurent Destailleur
45d6635bf6
Merge pull request #4025 from ndrosis/3.8
...
FIX utf-8 characters in the mask mercure does not break counter
2015-11-21 00:26:38 +01:00
Laurent Destailleur
611d8f3e86
Merge pull request #4021 from defrance/patch-75
...
add odt feature on supplier admin page
2015-11-21 00:24:15 +01:00
Laurent Destailleur
a906774595
Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order
...
NEW 3.9 add billed status for supplier order
2015-11-21 00:20:17 +01:00
Laurent Destailleur
bf2af33b89
Merge pull request #4015 from ParisLiakos/develop
...
Add a trigger for product translation deletion
2015-11-21 00:19:40 +01:00
Laurent Destailleur
925b6a7c98
Merge pull request #4014 from frederic34/patch-8
...
Update list.php
2015-11-21 00:18:42 +01:00
Laurent Destailleur
5e0b5cb75d
Merge pull request #4009 from frederic34/patch-7
...
Update list.php
2015-11-21 00:18:29 +01:00
Laurent Destailleur
e12760bb48
Merge pull request #3995 from frederic34/patch-5
...
Update list.php
2015-11-21 00:18:14 +01:00
Laurent Destailleur
552ecbcd95
Merge pull request #3964 from aspangaro/develop-hrm3
...
HRM : Work in progress
2015-11-21 00:14:41 +01:00
Laurent Destailleur
401b2a7389
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/theme/md/style.css.php
2015-11-20 23:47:07 +01:00
Laurent Destailleur
db27e08b7d
Work on md style
2015-11-20 23:45:31 +01:00
Marcos García de La Fuente
2dedea8736
FIX #4016 User link is not correctly formed in emailing receivers
2015-11-20 22:03:44 +01:00
Marcos García de La Fuente
5dba9ef54e
FIX #4043 Incorrect translation in error mesage in menu creation admin page
2015-11-20 22:00:11 +01:00
Drosis Nikos
ee4eb13fff
Update functions2.lib.php
2015-11-20 19:05:00 +02:00
arnaud
07226d32ec
FIX NB task and percent progress in box project
2015-11-20 16:11:48 +01:00
Florian HENRY
b8af7625ff
fix new extrafields feature
2015-11-20 15:29:31 +01:00
Florian HENRY
87c9132a6d
avoid error
2015-11-20 13:59:58 +01:00
Florian HENRY
101b45e397
Continue extrafeild $ID$ and select feature
2015-11-20 13:52:47 +01:00
Florian HENRY
b8cab9f4d9
continue extrafeild $ID$ and SELECT feature
2015-11-20 13:51:57 +01:00
Florian HENRY
4ff0c22e29
continue extrafield ID filter
2015-11-20 13:22:45 +01:00
Florian HENRY
eac28076c9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-20 11:59:39 +01:00
Florian HENRY
1566be35a1
NEW : add $ID$ into extrafields management to allow use current object
...
id on filter for select list from table and checkbox list from table
2015-11-20 11:59:28 +01:00
arnaud
4233d24f4b
FIX export with category contact extrafields
2015-11-19 18:01:58 +01:00
Frédéric FRANCE
47485b39ce
Update commande.class.php
2015-11-19 16:41:11 +01:00
Florian HENRY
80f19de223
fix && vs and
2015-11-19 16:32:25 +01:00
Frédéric FRANCE
6c8ac1e95c
typo
2015-11-19 16:31:55 +01:00
Frédéric FRANCE
3a2cb63575
Update list.php
2015-11-19 16:20:06 +01:00
Maxime Kohlhaas
9c1545bc1b
NEW add info page on product card
2015-11-19 14:45:05 +01:00
Maxime Kohlhaas
826592c480
Fix info and banner on societe
2015-11-19 14:43:00 +01:00
Maxime Kohlhaas
e4125c9802
NEW : info function for product card
2015-11-19 14:26:32 +01:00
philippe grand
4f280f63d0
[Qual] Uniformize code
2015-11-19 13:59:58 +01:00
Florian HENRY
0c4f7a1b22
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-19 12:55:20 +01:00
aspangaro
98d5f21787
Debug state
2015-11-19 06:21:37 +01:00
Juanjo Menent
a627e32fca
Merge pull request #4034 from fmarcet/3.7
...
FIX Not use localtaxes when invoice some orders
2015-11-18 23:07:24 +01:00
Juanjo Menent
3094f9ed32
Merge pull request #4032 from grandoc/develop
...
[Qual] Uniformize code
2015-11-18 23:05:04 +01:00
Juanjo Menent
5218501c04
Merge pull request #4024 from defrance/patch-81
...
bad limittoshow usage
2015-11-18 22:31:57 +01:00
Juanjo Menent
9ecdfa8be8
Merge pull request #4017 from apachler/develop
...
added Regions, Departements and Forme Juridique for Austria
2015-11-18 22:04:19 +01:00
Frédéric FRANCE
dfdc220c6b
Update list.php
2015-11-18 18:16:03 +01:00
Frédéric FRANCE
c647ad6425
Update list.php
2015-11-18 18:15:02 +01:00
Frédéric FRANCE
fe7cc95efd
Update list.php
2015-11-18 18:13:19 +01:00
fmarcet
f615927d24
FIX Not use localtaxes when invoice some orders
2015-11-18 17:56:04 +01:00
arnaud
85a58f666a
FIX product link in project box
2015-11-18 17:22:53 +01:00
philippe grand
42ed3d2bb7
[Qual] Uniformize code
2015-11-18 16:05:41 +01:00
Florian HENRY
fbe8a181a9
fix pgsql
2015-11-18 14:03:25 +01:00
fmarcet
0cbf8ca1dd
FIX #3726 When upload file, don't test if PRODUCT_USE_OLD_PATH_FOR_PHOTO
...
variable is empty or not
2015-11-18 13:59:25 +01:00
Laurent Destailleur
735c7b7d68
Code comment
2015-11-18 13:57:01 +01:00
Florian HENRY
0ffc2a226c
fix pg migration script
2015-11-18 13:53:04 +01:00
Laurent Destailleur
fbd1d2360f
Comment
2015-11-18 13:42:38 +01:00
Laurent Destailleur
5c6f7425f1
FIX: List of user to assign a task is not visible
2015-11-18 13:23:01 +01:00
Florian HENRY
28196a5fd9
add pgsql function
2015-11-18 12:24:52 +01:00
aspangaro
1e4d8ec104
New: HRM #3699 Add address informations in user card
2015-11-18 06:34:08 +01:00
aspangaro
ad457b416d
Use menu & add mode 'employee' in user/index.php
2015-11-17 22:51:34 +01:00
aspangaro
96d97657fd
Remove obsolete code
2015-11-17 22:17:18 +01:00
aspangaro
258ac45519
Remove obsolete code
2015-11-17 22:14:39 +01:00
aspangaro
1f9960d1bb
Remove info on employee card
2015-11-17 21:25:07 +01:00
aspangaro
c7df6c15a2
Different display if employee mode
2015-11-17 21:22:45 +01:00
aspangaro
b7b25c9682
Remove some code
2015-11-17 21:04:11 +01:00
aspangaro
a5ca6cb732
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-17 20:34:37 +01:00
Nikos Drosis
5082b1cc66
Fix for utf-8 characters in the mask mercure
2015-11-17 20:22:27 +02:00
Laurent Destailleur
683ad24ece
Take number of entry into top menu to defined the trigger to change size
...
of top menu thumbs
2015-11-17 19:16:40 +01:00
Laurent Destailleur
b1c5768de9
NEW Add fields into llx_cronjobs to be able to use job table to queue
...
one shot jobs.
2015-11-17 18:22:39 +01:00
BENKE Charlie
ce367bfa31
bad limittoshow usage
...
the value selected in MAIN_MAXTABS_IN_CARD is not well used (particulary when the active tab is present on tabcollector
2015-11-17 14:42:34 +01:00
Laurent Destailleur
6dc6bab556
Support of 'small', 'mini' and '' image size everywhere.
2015-11-17 10:38:00 +01:00
Laurent Destailleur
86db029cb3
Merge pull request #4013 from fappels/develop
...
Fix migration - remove default for text field
2015-11-17 10:06:07 +01:00
BENKE Charlie
4aad7122e0
add odt feature on supplier admin page
...
add odt feature on supplier admin page
2015-11-17 10:06:03 +01:00
BENKE Charlie
8630a2d56b
add odt feature on supplier admin page
...
add odt feature on admin page
2015-11-17 10:04:13 +01:00
Andreas Pachler
161b75acfc
added Regions, Departements and Forme Juridique for Austria
2015-11-17 06:56:49 +01:00
Laurent Destailleur
c6e7413349
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-17 00:58:22 +01:00
Laurent Destailleur
f5631cac45
NEW Introduce property module_position so a module can decide where it
...
appears into list of modules.
2015-11-17 00:58:12 +01:00
Paris Liakos
fb6819764d
Add PRODUCT_DEL_MULTILANGS trigger for translation deletion on product
2015-11-17 01:20:58 +02:00
Laurent Destailleur
a8bfa1a258
Merge pull request #4011 from ParisLiakos/develop
...
Add triggers for product and category translation changes
2015-11-16 23:50:18 +01:00
Laurent Destailleur
508b11733a
Merge pull request #4010 from atm-alexis/3.8_FIX_Allow_to_search_on_alias_name
...
FIX 3.8 allow to search on alias name into select
2015-11-16 23:48:18 +01:00
Laurent Destailleur
2f1a1c5111
Merge pull request #4008 from atm-ph/fix_38_trigger_propal_clone
...
FIX can not have access to the new ids or propal lines on PROPAL_CLONE
2015-11-16 23:46:03 +01:00
Laurent Destailleur
835700bb25
Merge pull request #4006 from marcosgdf/bug-3989
...
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
2015-11-16 23:42:38 +01:00
Laurent Destailleur
04ffe1c7f0
Merge pull request #4005 from marcosgdf/bug-3988
...
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
2015-11-16 23:42:04 +01:00
Laurent Destailleur
76eeb0d2f1
Merge pull request #4004 from marcosgdf/bug-3992
...
FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be
2015-11-16 23:41:46 +01:00
Laurent Destailleur
0e511027f6
Merge pull request #4003 from marcosgdf/bug-3996
...
FIX #3996 Dictionnary hooks are not working in 3.8
2015-11-16 23:41:06 +01:00
Laurent Destailleur
9693982f27
Merge pull request #4002 from marcosgdf/bug-3997
...
FIX #3997 Wrong permission key used for Margins > Read all
2015-11-16 23:40:47 +01:00
Laurent Destailleur
dbf384ec6b
Merge pull request #4000 from fmarcet/develop_bolivia
...
New: Bolivian regions and departments
2015-11-16 23:40:16 +01:00
Laurent Destailleur
d16efbaf24
Merge pull request #3999 from fmarcet/3.8
...
FIX: Can't update line's duration
2015-11-16 23:39:44 +01:00
Laurent Destailleur
66f24ff400
Merge pull request #3983 from grandoc/develop
...
[Qual] Uniformize code
2015-11-16 23:31:40 +01:00
Laurent Destailleur
2fbb030d61
Merge pull request #3984 from frederic34/warehouse
...
Select warehouse on order card
2015-11-16 23:31:25 +01:00
Laurent Destailleur
de70321149
Merge pull request #3982 from frederic34/imgstatut
...
Add statut2 icon and adjust some other
2015-11-16 23:30:49 +01:00
Frédéric FRANCE
59dd1502de
Update list.php
2015-11-16 21:29:39 +01:00
fappels
e9be3d19f4
Fix migration - remove default for text field
...
remove default for user_param value text field
lang typo
2015-11-16 21:24:08 +01:00
Paris Liakos
146aa7815b
Add X_SET_MULTILANGS triggers to make possible reacting on translation changes for products and categories
2015-11-16 20:27:51 +02:00
Alexis Algoud
a7d2bdc2c1
FIX 3.8 allow to search on alias name into select
2015-11-16 19:10:20 +01:00
Frédéric FRANCE
0424a2bb3d
Update list.php
2015-11-16 16:27:37 +01:00
phf
c21354101f
FIX can not have access to the new ids or propal lines on PROPAL_CLONE
2015-11-16 15:36:02 +01:00
Alexis Algoud
55b23c4918
FIX add billed field in supplier order
2015-11-16 14:55:46 +01:00
Marcos García de La Fuente
53fb085766
Corrected indent
2015-11-16 13:29:37 +01:00
Marcos García de La Fuente
ec7e4cb3d4
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
2015-11-16 13:25:00 +01:00
Marcos García de La Fuente
0880b13142
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
2015-11-16 13:24:11 +01:00
Marcos García de La Fuente
be460b6cbf
FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be
2015-11-16 13:20:56 +01:00
Marcos García de La Fuente
8e9e2911ae
FIX #3996 Dictionnary hooks are not working in 3.8
2015-11-16 13:18:25 +01:00
Marcos García de La Fuente
73da011461
FIX #3997 Wrong permission key used for Margins > Read all
2015-11-16 13:16:54 +01:00
fmarcet
9e51cf66dd
New: Bolivian regions and departmens
2015-11-16 12:34:59 +01:00
fmarcet
0a92849de3
FIX: Can't update line's duration
2015-11-16 10:57:47 +01:00
aspangaro
06f752b250
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
2015-11-16 06:50:04 +01:00
Frédéric FRANCE
ba60313f88
Update list.php
2015-11-16 00:11:03 +01:00
Frédéric FRANCE
faff8e2cd8
Update list.php
2015-11-16 00:01:34 +01:00
Laurent Destailleur
dfc01e971f
Update files for transifex sync
2015-11-15 20:27:43 +01:00
Florian HENRY
c3b7bbfb3b
FIX : #3990
2015-11-15 20:00:11 +01:00
Laurent Destailleur
7afedd3f8b
Minor enhancement of theme MD
2015-11-15 19:29:18 +01:00
Laurent Destailleur
6bd6be0912
Debug and rename experimental module "supplier proposal". Still work to
...
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
388748055a
Fix missing translation for VAT
2015-11-15 15:08:54 +01:00
frederic34
e0ee6718ad
Select warehouse on order card
2015-11-15 11:42:47 +01:00
Laurent Destailleur
db941d5395
NEW Enhance style engine. Add option to set color of links
2015-11-15 11:31:09 +01:00
philippe grand
f308606ee1
[Qual] Uniformize code
2015-11-15 07:47:35 +01:00
Laurent Destailleur
192fdbdcc4
Minor look uniformization
2015-11-14 23:10:12 +01:00
Laurent Destailleur
c2ec4a4fd2
Move online help link at a better place (top right). Link is also always
...
visible.
2015-11-14 22:49:34 +01:00
Laurent Destailleur
6895daa5e9
Fix tr/td not correctly open/closed
...
Fix default value was not set
2015-11-14 19:31:50 +01:00
Laurent Destailleur
80127cbbc9
Fix tr/td not correctly open/closed
...
Fix default value was not set
2015-11-14 19:31:16 +01:00
Laurent Destailleur
1da53501a1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-14 17:54:28 +01:00
Laurent Destailleur
01058be44c
NEW Introduce a "code" into fiels to describe vat. This will allow to
...
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00