Laurent Destailleur
dee9442720
Fix regression
2018-09-01 13:12:09 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Laurent Destailleur
b89202572e
Merge pull request #9342 from ptibogxiv/patch-51
...
fix multicompany and footer ticket public page
2018-09-01 12:33:55 +02:00
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace
...
PSR2 FunctionClosingBrace
2018-09-01 12:06:08 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix
2018-09-01 09:40:50 +02:00
Frédéric FRANCE
b015d05f07
function Comment Missing
2018-08-31 22:25:11 +02:00
Frédéric FRANCE
e47059fa36
function Comment Missing
2018-08-31 22:14:09 +02:00
Frédéric FRANCE
5d27318e3b
function Comment Missing
2018-08-31 22:03:12 +02:00
Frédéric FRANCE
df6eccc5dd
function Comment Missing
2018-08-31 22:01:13 +02:00
Frédéric FRANCE
ebcf43ec73
function Comment Missing
2018-08-31 21:39:23 +02:00
Laurent Destailleur
b08971b03b
FIX vat rate code not return by get_product_vat_for_country
2018-08-31 14:52:34 +02:00
Laurent Destailleur
8dc208c961
Fix missing legal ids in source address
2018-08-30 19:19:43 +02:00
Laurent Destailleur
151d84405a
FIX trans on null object
2018-08-30 17:01:49 +02:00
Laurent Destailleur
d14bd829fb
FIX trans on null object
2018-08-30 17:01:22 +02:00
ptibogxiv
de73f1545f
fix multicompany and footer
...
- fix viewimage and multicompany + no login
- delete ticket footer for common payment.lib.php footer
2018-08-30 02:42:14 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Laurent Destailleur
3ebfb23407
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
2018-08-29 20:22:50 +02:00
Laurent Destailleur
74b3e3e814
Fix for compatibility with lines with no prices (some external modules)
2018-08-29 14:50:12 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Laurent Destailleur
6f427cbed3
Merge pull request #9293 from frederic34/patch-25
...
NEW Add __DAY_TEXT__ and __MONTH_TEXT__ substitutions vars
2018-08-28 01:42:35 +02:00
Laurent Destailleur
5185d32cc9
Merge pull request #9286 from frederic34/patch-22
...
Update propal.lib.php
2018-08-28 01:40:58 +02:00
Laurent Destailleur
7a35b560a6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-23 19:51:52 +02:00
Laurent Destailleur
499d93b8c4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/projet/class/task.class.php
htdocs/projet/tasks/task.php
2018-08-23 19:50:58 +02:00
Frédéric FRANCE
6abd5d478a
Update functions.lib.php
2018-08-23 17:15:14 +02:00
Frédéric FRANCE
692352e0e4
Update propal.lib.php
2018-08-22 22:55:12 +02:00
Laurent Destailleur
cd09052e80
FIX badge on time spent on project and tasks
2018-08-21 14:52:22 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Frédéric FRANCE
391995c09b
Update propal.lib.php
2018-08-18 17:26:42 +02:00
Laurent Destailleur
ab22c9d0de
Work on import
2018-08-16 21:48:16 +02:00
Cédric
fe6779c223
Erreur de syntaxe ( + au lieu de . )
2018-08-16 17:20:38 +02:00
Laurent Destailleur
f7da76e1c0
Use session cache for stats
2018-08-16 14:24:59 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing
2018-08-16 00:47:09 +02:00
Laurent Destailleur
3b245f1b30
Merge pull request #9247 from frederic34/missingReturn
...
return comment
2018-08-16 00:35:39 +02:00
Frédéric FRANCE
69a7af88e7
function declaration
2018-08-15 18:14:02 +02:00
Frédéric FRANCE
54a078149a
function declaration
2018-08-15 17:34:35 +02:00
Laurent Destailleur
ec56ad752c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
Laurent Destailleur
37ca3ff230
Fix separator
2018-08-14 20:51:24 +02:00
Frédéric FRANCE
a0a6afc224
return comment
2018-08-14 12:23:10 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Laurent Destailleur
2d571acc03
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Laurent Destailleur
6954ab00f9
Update functions.lib.php
2018-08-12 18:11:27 +02:00
Frédéric FRANCE
79aaddbb66
test phpcs v3
2018-08-09 14:46:00 +02:00
Laurent Destailleur
61d7629ab1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
John BOTELLA
3036c94198
Add new situation retained warranty field
2018-08-07 15:18:42 +02:00
ATM-Nicolas
70adfb135d
FIX : Missing behavior
2018-08-03 09:51:29 +02:00
Laurent Destailleur
e106fda5e6
Merge pull request #9113 from torvista/export-import
...
Fix for Warning: A non-numeric value encountered in bank.lib.php on line 359
2018-08-02 18:38:46 +02:00
Laurent Destailleur
0e3473701a
Update bank.lib.php
2018-08-02 18:38:33 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include
...
Include and co are statements
2018-08-02 11:03:44 +02:00
John BOTELLA
4ddca02bb9
fix situation line's total
2018-07-31 14:58:33 +02:00
ATM-Nicolas
b9a44fc76b
FIX : Wrong position of firstname lastname
2018-07-31 12:15:18 +02:00
Laurent Destailleur
7af42c66cc
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
2018-07-27 12:54:45 +02:00
Laurent Destailleur
83ae27d122
FIX Deletion of files in migration
2018-07-27 12:33:36 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing
2018-07-26 19:05:34 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
Philippe GRAND
7d5464cfbc
Clean and update code
2018-07-25 15:25:23 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Laurent Destailleur
d871b8964f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-24 19:23:40 +02:00
Laurent Destailleur
20f178fdfe
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
2018-07-24 19:22:00 +02:00
Laurent Destailleur
a1bdc6022d
Website module
2018-07-24 01:10:38 +02:00
Laurent Destailleur
174394c476
Work on website module
2018-07-23 14:08:20 +02:00
Frédéric FRANCE
d582f72bd9
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
2018-07-22 17:27:02 +02:00
Laurent Destailleur
c4e207e8b7
Fix dol_string_onlythesehtmltags
2018-07-22 15:51:19 +02:00
Laurent Destailleur
2c7029850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
2018-07-21 20:28:26 +02:00
Laurent Destailleur
8247bb683c
Debug website module
2018-07-19 21:35:21 +02:00
Laurent Destailleur
445db58966
FIX website in inline edit mode
2018-07-19 16:06:48 +02:00
Laurent Destailleur
e362a0e9df
FIX website in inline edit mode
2018-07-19 16:06:06 +02:00
Laurent Destailleur
efa5cdeab1
More complete list of allowed html tags
2018-07-19 15:24:48 +02:00
Laurent Destailleur
26507ee712
Code comment
2018-07-17 14:02:08 +02:00
Laurent Destailleur
7fcec5f6c3
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:54:13 +02:00
Laurent Destailleur
8249179fb8
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:50:26 +02:00
Laurent Destailleur
d4a5491753
Fix duplicate tab "contact" on thirdparty
2018-07-17 13:48:08 +02:00
Steve
9d3a0442c0
dolibarr-develop, php 7.2.7
...
On third party, add bank account. After spanish account has been added, on summary screen
..../htdocs/societe/paymentmodes.php
a correct account number causes the error:
Warning: A non-numeric value encountered in .......\public_html\dolibarr-develop\htdocs\core\lib\bank.lib.php on line 359
This is
`$sum += $values[$i] * substr($InumCta, $i, 1);`
Since substr returns a string it cannot be summed (I assume).
I changed it to
`$sum += $values[$i] * (int)substr($InumCta, $i, 1)`
2018-07-16 17:10:33 +02:00
Laurent Destailleur
e5f2fbf8db
Fix trans
2018-07-16 15:21:29 +02:00
Laurent Destailleur
41605ed4a7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
Laurent Destailleur
c477ca8266
Fix scrutinizer
2018-07-16 11:25:21 +02:00
Laurent Destailleur
e3d9e609d5
Fix var not defined
2018-07-16 11:20:54 +02:00
Laurent Destailleur
d3cc2c81eb
Better detail for time elapsed
2018-07-16 11:14:39 +02:00
Laurent Destailleur
1e42db0641
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-15 20:16:54 +02:00
Laurent Destailleur
bff4ed8103
Merge pull request #9098 from atm-florian/develop
...
fix list of event of thirdparty and unformize code
2018-07-15 20:10:19 +02:00
Laurent Destailleur
a5442033ac
Code comment
2018-07-15 20:09:51 +02:00
Laurent Destailleur
ba36d1aef0
Merge pull request #9095 from IAS-SYSTEMS-CSC/dolibarr-fixes
...
fix sql error functions.lib.php
2018-07-15 20:00:54 +02:00
Laurent Destailleur
0ca9f6f522
Update functions.lib.php
2018-07-15 20:00:43 +02:00
florian HENRY
09fe2f83fa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2018-07-12 18:27:22 +02:00
florian HENRY
1fa13fc747
fix list of event unformize code
2018-07-12 18:27:09 +02:00
ias-ceo
076bf0a3a7
fix sql error
2018-07-12 05:09:36 +03:00
Laurent Destailleur
4c65f4d498
Log
2018-07-11 09:38:40 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Laurent Destailleur
44626a3a48
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-07-10 13:57:24 +02:00
Laurent Destailleur
aeb5f5e4f3
Fix phpcs
2018-07-10 13:56:03 +02:00
Laurent Destailleur
a55abb4da7
Fix version
2018-07-10 13:54:20 +02:00
Laurent Destailleur
b6180fcb58
Fix fetch index in ecm when using multicompany
2018-07-10 12:00:09 +02:00
Laurent Destailleur
8e0a663b7c
Code comment
2018-07-10 10:53:59 +02:00
Laurent Destailleur
f5d9403c7d
Fix permission to see HR tab on user. All HR on same tabs.
2018-07-09 15:38:00 +02:00
Laurent Destailleur
e427496ddf
FIX Injection
2018-07-09 14:13:01 +02:00
Laurent Destailleur
45d1a14c8e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 16:10:37 +02:00
Laurent Destailleur
05ed721a8c
Fix name of constant for module TICKET
2018-07-06 13:09:07 +02:00
Laurent Destailleur
3a593f88f1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-05 10:28:24 +02:00
Laurent Destailleur
5883899bc7
Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS
2018-07-05 02:33:39 +02:00
Laurent Destailleur
91b7ee5fc2
NEW Add function isValidMXRecord
2018-07-04 11:07:28 +02:00
Laurent Destailleur
e1e813b895
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:26 +02:00
Laurent Destailleur
12c43d7722
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:17 +02:00
Regis Houssin
df718cca5c
Fix: better sql request with multicompany transverse mode
2018-07-02 10:09:56 +02:00
BENKE Charlene
43c5d7abdc
add holliday_admin_prepare_head
...
sorry eldy i forget it
2018-07-01 17:33:35 +02:00
Regis Houssin
80adac12c0
Fix: use object entity ID instead current entity
2018-07-01 16:01:30 +02:00
Laurent Destailleur
d8c7c61951
Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into
...
hregis-8.0_canvas
# Conflicts:
# htdocs/product/canvas/product/tpl/list.tpl.php
2018-06-30 18:29:08 +02:00
Laurent Destailleur
ee2d543781
Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist
...
NEW support selllist in the module builder
2018-06-30 15:33:17 +02:00
Regis Houssin
f998f64db0
Works on use new list engine instead template for canvas
...
Conflicts:
htdocs/product/list.php
2018-06-30 10:52:26 +02:00
Laurent Destailleur
3112244529
Merge pull request #8884 from defrance/patch-117
...
New : fichinter models (like factureRec)
2018-06-30 01:19:03 +02:00
Laurent Destailleur
b1d94af439
Merge pull request #8931 from ruistrecht-alt/MAIN_DOCUMENTS_DESCRIPTION_FIRST
...
NEW Add hidden option MAIN_DOCUMENTS_DESCRIPTION_FIRST
2018-06-29 20:04:24 +02:00
Laurent Destailleur
9eaca045e4
Fix default message with online payment link must be hidden when no
...
online payment mode exists.
2018-06-27 11:34:40 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
9f77ea0ece
Code comment
2018-06-25 17:05:15 +02:00
Laurent Destailleur
06342ff80c
FIX contextpage on contact list
2018-06-23 12:06:17 +02:00
Laurent Destailleur
4dcc74d08f
Fix the "back to list" link also restore the contextpage
2018-06-23 11:55:04 +02:00
Laurent Destailleur
533c19cc2c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/core/lib/functions.lib.php
2018-06-22 15:29:26 +02:00
Laurent Destailleur
a3b9d4f01b
Fix tooltip on subsidiary list
2018-06-20 22:02:36 +02:00
Regis Houssin
8fc2f7441c
Fix: to avoid deleting line breaks
2018-06-20 09:06:16 +02:00
Laurent Destailleur
63fb82931c
Update functions.lib.php
2018-06-18 10:41:11 +02:00
Laurent Destailleur
186f08e67b
Fix preview of PDF for supplier objects
2018-06-16 15:08:13 +02:00
altatof
5d6cd381b9
Fix <br/> detection
2018-06-15 15:59:14 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Laurent Destailleur
1d7d16649a
Code comment
2018-06-11 12:31:26 +02:00
Laurent Destailleur
f0446d2a3b
Fix for content editable sites
2018-06-11 10:25:22 +02:00
Laurent Destailleur
557db7661c
Fix for content editable sites
2018-06-11 10:19:42 +02:00
Laurent Destailleur
8142a672a7
PDF compatibility. Use hidden option to force PDF1/A instead of PDF-1.3
2018-06-07 21:12:30 +02:00
Rui Strecht
083acb1af5
Added MAIN_DOCUMENTS_DESCRIPTION_FIRST option to allow desc to appear before product/service label in documents
2018-06-07 16:24:45 +01:00
Laurent Destailleur
d10c9cf565
FIX dir for modules must not have s at end (fix contracts into contract)
2018-06-06 23:47:48 +02:00
Laurent Destailleur
bb97119233
Fix duplicate function name
2018-06-06 18:07:32 +02:00
Laurent Destailleur
30b04c0d3d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2018-06-05 18:16:32 +02:00
Laurent Destailleur
4c21ad4e4e
FIX: dol_delete_file must work in a context without db handler loaded
...
Conflicts:
htdocs/core/lib/files.lib.php
2018-06-05 18:12:14 +02:00
Laurent Destailleur
1671c8b6cc
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-05 18:06:30 +02:00
Laurent Destailleur
9c32e49bd3
FIX: dol_delete_file must work in a context without db handler loaded
2018-06-05 18:05:33 +02:00
Laurent Destailleur
87d073b5cd
Fix conflict with external ticketsup module
2018-06-04 21:49:29 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
Laurent Destailleur
d8d4d15b4b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-30 12:13:40 +02:00
Laurent Destailleur
de59892438
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 12:13:18 +02:00
Laurent Destailleur
02da9b6992
FIX #8893 to get formatted price as substitution vars
2018-05-30 11:04:44 +02:00
BENKE Charlene
4a7ac774f7
introduce fichinter rec models
2018-05-28 16:38:11 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
patrick Delcroix
ef37fccef4
Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist
2018-05-26 23:43:17 +02:00
patrick Delcroix
adda3144bc
Fix Show double(x,y) fields
2018-05-26 23:39:36 +02:00
Laurent Destailleur
75b6dc6f61
Update modulebuilder.lib.php
2018-05-25 12:23:39 +02:00
Laurent Destailleur
8303dc1e6f
Merge pull request #8815 from atm-florian/develop_fixproject
...
NEW: add filter on project task list
2018-05-25 10:56:10 +02:00
Laurent Destailleur
c56ef86bc3
Update project.lib.php
2018-05-25 10:50:16 +02:00
Laurent Destailleur
e51aa68284
Fix link to warehouses for events
2018-05-24 12:16:04 +02:00
delcroix Patrick
c85d216f8e
Merge branch 'develop' into patch-modulebuilder-supportsellist
2018-05-22 22:24:20 +02:00
patrick Delcroix
2ccaf1ad95
New: support sellist in modulebuilder
2018-05-22 22:00:20 +02:00
Laurent Destailleur
1b20ec05d1
Save translation
2018-05-21 19:37:47 +02:00
florian HENRY
dd946dd197
add ressource
2018-05-21 11:03:48 +02:00
florian HENRY
f5c245cd19
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_fixproject
2018-05-21 10:59:10 +02:00
florian HENRY
986b4f78ba
fix eldy comment
2018-05-18 13:54:07 +02:00
florian HENRY
a27c263747
NEW: add filter on project task list
2018-05-18 10:33:32 +02:00
Laurent Destailleur
e503aeb2e5
Merge pull request #8787 from aspangaro/8.0-a24
...
Update module assets
2018-05-18 09:05:46 +02:00
Laurent Destailleur
ef395fc36b
Fix scrutinizer bugs
2018-05-16 15:23:52 +02:00
Alexandre SPANGARO
9c6f92986e
Upgrade works
2018-05-11 21:48:22 +02:00
Laurent Destailleur
63b9384ef6
No transmormation of data objectid before calling trigger
2018-05-10 12:34:23 +02:00
Laurent Destailleur
2fb5de6136
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-10 12:30:14 +02:00
Laurent Destailleur
c094a6c43e
Reorder permissions
2018-05-10 12:29:58 +02:00
Laurent Destailleur
fddd628f08
Merge pull request #8764 from hregis/develop_email
...
NEW add pdf function to check if pdf file is protected/encrypted
2018-05-10 12:08:58 +02:00
Laurent Destailleur
9077f18dd6
Update security.lib.php
2018-05-10 11:37:22 +02:00
Laurent Destailleur
8837193545
Merge branch 'develop' into permissions_hook
2018-05-10 11:36:08 +02:00
Laurent Destailleur
bc9eaaab84
Update security.lib.php
2018-05-10 11:34:20 +02:00
Laurent Destailleur
7be804dcf5
Update security.lib.php
2018-05-10 11:32:08 +02:00
Laurent Destailleur
0891766a3e
Update security.lib.php
2018-05-10 11:31:27 +02:00
Laurent Destailleur
ea4c48047a
All new hooks must be addreplace hooks
2018-05-10 11:30:27 +02:00
Regis Houssin
415b7425fd
NEW add pdf function to check if pdf file is protected/encrypted
2018-05-08 09:45:10 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
altatof
a8ecce9e6d
add hook for more permissions control
2018-05-05 14:31:17 +02:00
Laurent Destailleur
5cff4c152b
Add tab "time spent" in project view. Can swith gantt/list.
2018-05-04 11:25:21 +02:00
Laurent Destailleur
08cf034e2f
FIX to allow IRPF not null even if main VAT is null.
...
From https://www.javierrguez.com/problema-facturas-irpf-sin-iva-dolibarr/
2018-05-03 13:39:44 +02:00
Laurent Destailleur
124abd39b6
Code comment
2018-05-01 20:31:57 +02:00
Laurent Destailleur
dc9892f803
Fix bad log
2018-05-01 20:17:03 +02:00
Laurent Destailleur
3cad7c6998
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-01 12:51:46 +02:00
Laurent Destailleur
4eb4cf6506
Merge pull request #8693 from Librethic/fix-api-product-check-perm
...
FIX : missing english name for object
2018-05-01 10:19:27 +02:00
Laurent Destailleur
55f982e504
Removed deprecated FPDI option and reorganise PDF setup page
2018-04-30 09:28:24 +02:00
Laurent Destailleur
2fc2c44de4
Fix phpcs
2018-04-29 20:18:50 +02:00
Laurent Destailleur
0cdfd6800a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-29 20:11:47 +02:00
Laurent Destailleur
82a8513aed
Standardize code
2018-04-29 19:52:14 +02:00
Laurent Destailleur
aafab12f4b
Debug API for ticket module
2018-04-29 18:06:31 +02:00
Laurent Destailleur
e72c2e6a11
Enhance sorting of field for lists on field with several sort criterias
2018-04-28 19:54:41 +02:00
Laurent Destailleur
94d6e178f7
Work on vat report code rewrite
2018-04-28 16:06:46 +02:00
jfefe
7cedf55c27
FIX : missing english name for object
...
'product' is used by API to check perms and return a 401 error even if user has correct
permissions
2018-04-27 20:54:48 +02:00
Laurent Destailleur
257dc1cf77
Work on rewriting VAT reports
2018-04-27 19:17:34 +02:00
Laurent Destailleur
19d15c79dd
Merge pull request #8673 from frederic34/variantonservice
...
NEW Module variant supported on services
2018-04-27 10:01:28 +02:00
Laurent Destailleur
3faeb08b78
Merge pull request #8672 from ATM-Nicolas/fix_action_contact
...
FIX : Related contact printed in societe agenda
2018-04-27 10:00:18 +02:00
Laurent Destailleur
1d40d34123
Merge pull request #8669 from tomours/develop
...
Fix french bank holidays (Easter related)
2018-04-27 09:56:01 +02:00
Laurent Destailleur
42722da824
Update date.lib.php
2018-04-27 09:55:44 +02:00
Laurent Destailleur
dde86628e7
Update date.lib.php
2018-04-27 09:49:52 +02:00
Laurent Destailleur
e1cfe0e2dd
Update date.lib.php
2018-04-27 09:49:15 +02:00
Laurent Destailleur
59e5545aa7
Fix phpunit
2018-04-27 09:18:25 +02:00
Laurent Destailleur
69db960a92
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/activity/perweek.php
2018-04-26 18:33:02 +02:00
Laurent Destailleur
d988585f86
Save spaces in timesheet report page
2018-04-26 11:07:20 +02:00
Laurent Destailleur
6b2bd93469
NEW Add dol_is_link function
2018-04-25 17:59:05 +02:00
Laurent Destailleur
39aef07c6b
FIX Only voters can send comments in public survey page
2018-04-25 17:14:18 +02:00
Laurent Destailleur
83b762b681
FIX CVE-2018-9019
2018-04-25 16:01:06 +02:00
Laurent Destailleur
75a4891113
Add az09comma to sanitize sortfield/sortorder
2018-04-25 15:47:42 +02:00
Frédéric FRANCE
5f4e2dc565
variant on services
2018-04-24 11:01:17 +02:00
ATM-Nicolas
736c56705b
FIX : Related contact printed in societe agenda
2018-04-24 10:02:26 +02:00
Thomas OURSEL
4fd0ab3f31
Merge remote-tracking branch 'upstream/develop' into develop
2018-04-23 15:57:09 +02:00
Thomas OURSEL
f402753fa3
Fix french holidays (Easter related)
2018-04-23 15:14:34 +02:00
Laurent Destailleur
e9a2894727
Fix PSR2
2018-04-22 20:59:29 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop
...
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
d0efc41983
New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD
2018-04-20 14:50:11 +02:00
Ferran Marcet
6ced1a3264
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-20 10:38:16 +02:00
Laurent Destailleur
0358e0f29f
Debug ticketsup
2018-04-19 15:11:26 +02:00
Laurent Destailleur
fc167612c2
NEW class reposition can also work on POST (not only GET)
2018-04-19 13:59:20 +02:00
Laurent Destailleur
4472234637
Can set email in dol_print_error_email
2018-04-19 12:12:54 +02:00
Laurent Destailleur
d8e05c90f7
Can set email in dol_print_error_email
2018-04-19 12:12:19 +02:00
Laurent Destailleur
0f16ccbc4a
Enhance dol_encode/dol_decode function
2018-04-19 12:03:42 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
a0f8aa50d5
CSS
2018-04-18 00:00:37 +02:00
Laurent Destailleur
4dadfac74b
Debug usage of the new extrafield architecture
2018-04-17 14:34:17 +02:00
Laurent Destailleur
7b53ec5198
FIX timestamp must be an int not a float
2018-04-17 12:41:13 +02:00
Laurent Destailleur
c3970f1a52
Code comment
2018-04-17 09:44:57 +02:00
Laurent Destailleur
1e0a660d24
More font awesome picto instead of img
2018-04-16 19:57:46 +02:00
Laurent Destailleur
f19abe38d7
FIX pdf thumb for expense report
2018-04-16 18:17:35 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
72de21537c
Clean code
2018-04-15 20:09:09 +02:00
Laurent Destailleur
6450f95c90
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-15 19:13:38 +02:00
Laurent Destailleur
e2838aa074
NEW Show also size in bytes in tooltip if visible unit is not bytes
2018-04-15 17:58:13 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
57c03553dd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-04-15 12:09:07 +02:00
Laurent Destailleur
13ba69e085
Merge pull request #8595 from hregis/develop_ldap
...
Fix: broken $pdf object !
2018-04-15 11:38:51 +02:00
Laurent Destailleur
da66e5c5a7
Update pdf.lib.php
2018-04-15 11:38:29 +02:00
Laurent Destailleur
37e4da30d0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-15 11:33:27 +02:00
Laurent Destailleur
ffffd848a9
Look and feel v8
2018-04-14 22:34:46 +02:00
Laurent Destailleur
77b686500c
css
2018-04-14 21:07:20 +02:00
Regis Houssin
fb4765c472
Fix clean code
2018-04-14 15:24:52 +02:00
Regis Houssin
732f019fb2
Fix: json format in llx_const
2018-04-14 15:17:51 +02:00
Regis Houssin
25a87507b9
NEW add new parameters for tcpf encryption
2018-04-14 15:12:51 +02:00
Juanjo Menent
bfed1b9db1
FIX: some localtaxes errors
2018-04-14 12:45:40 +02:00
Regis Houssin
d97c052d08
Fix: broken $pdf object !
2018-04-14 10:41:38 +02:00
Laurent Destailleur
c25e21de4b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-13 23:19:22 +02:00
Laurent Destailleur
ecfabc6633
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions.lib.php
2018-04-13 23:18:39 +02:00
Laurent Destailleur
a0e243a29b
Clean code
2018-04-13 23:11:19 +02:00
Laurent Destailleur
93ea46c58c
Merge branch 'develop' into develop-ecmfiles
2018-04-13 23:08:26 +02:00
Laurent Destailleur
374a0723bf
Fix VAT report by rate
2018-04-13 22:20:14 +02:00
Regis Houssin
556a418132
Fix: best method
2018-04-13 19:30:11 +02:00
Regis Houssin
199bf4c044
Fix: avoid focus problem when select2 is in a modal dialog window
2018-04-13 17:10:07 +02:00
fappels
e054d1ae8d
Try to fix travis
2018-04-13 16:49:03 +02:00
Laurent Destailleur
4251748aca
Clean code
2018-04-13 16:18:33 +02:00
Laurent Destailleur
fbae4429b7
Clean code for better extrafields management
2018-04-13 12:52:23 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16
...
NEW Add files management on products lot
2018-04-13 00:57:13 +02:00
Laurent Destailleur
3cecfd02c7
NEW Mutualize code for action="update_extras"
...
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
2018-04-12 23:16:23 +02:00
All-3kcis
21df700325
Add option to save file with product batch ref
...
+ use batch number like ref instead of id
+ debug access to shared link
2018-04-12 15:55:08 +02:00
All-3kcis
f7e58f3c73
Add files management on products lot
2018-04-12 15:10:37 +02:00
Laurent Destailleur
dd022ee423
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-12 13:31:38 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Laurent Destailleur
3df873ee06
Merge pull request #8562 from ATM-Marc/FIX_modulebuilder
...
FIX: various modulebuilder-related issues
2018-04-11 18:01:04 +02:00
Laurent Destailleur
e543a6bf85
Merge pull request #8549 from atm-greg/fix_multiselect_filter
...
FIX #8480
2018-04-11 17:38:30 +02:00
Laurent Destailleur
1aace69b1a
Update functions.lib.php
2018-04-11 17:37:00 +02:00
Laurent Destailleur
c70e0c1cda
FIX #8475 #8540
2018-04-11 17:14:34 +02:00
Marc de Lima Lucio
fa8cf98249
FIX: modulebuilder: handle 'price' fieldtype
2018-04-11 12:18:54 +02:00
Marc de Lima Lucio
2f75bfcd83
FIX: modulebuilder: could not create html fields
2018-04-11 11:46:47 +02:00
atm-greg
8a0baaad17
fix #8480
2018-04-10 16:25:06 +02:00
atm-greg
4f13a4f45b
fix #8521
2018-04-10 14:16:01 +02:00
Laurent Destailleur
65996c47ff
Fix clean email syntax to remove , to avoid error RFC-5321 address
2018-04-10 11:15:21 +02:00
Laurent Destailleur
24f4d5040a
Move isInEEC from common to thirdparty class.
2018-04-09 14:25:02 +02:00
Laurent Destailleur
4d2d9193b9
Work on VAT reports to use option MAIN_INFO_VAT_RETURN
2018-04-07 15:47:13 +02:00
Laurent Destailleur
d46a8eb8f0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
0abcf5694c
Fix message of discount
2018-04-06 20:18:36 +02:00
Laurent Destailleur
1a321e19c8
FIX XSS in company setup page
2018-04-06 19:12:13 +02:00
Laurent Destailleur
a886fadc2d
Merge pull request #8493 from aspangaro/8.0-a13
...
NEW Module Assets
2018-04-06 12:41:56 +02:00
Laurent Destailleur
956fc2376d
FIX #8483
2018-04-06 12:27:55 +02:00
Regis Houssin
b43aca0f8d
Fix: use dol_string_nohtmltag instead (with strip_tags)
2018-04-06 08:52:02 +02:00
Alexandre SPANGARO
06dc70df09
Merge remote-tracking branch 'uptream/develop' into 8.0-a13
2018-04-05 20:42:28 +02:00
Laurent Destailleur
48ff89c63b
Fix regression
2018-04-05 19:52:54 +02:00
Laurent Destailleur
d55657951d
Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda
...
FIX: img_pictos for remove assigned user in agenda card
2018-04-05 16:42:40 +02:00
Laurent Destailleur
d19514fd99
Merge pull request #8496 from hregis/develop_bug5
...
Fix: multiple avoid Warning and errors
2018-04-05 16:16:48 +02:00
Laurent Destailleur
eeb2d5a4da
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/cron/list.php
2018-04-05 13:24:36 +02:00
Laurent Destailleur
88b3e08b22
FIX filter/sorting on extrafield on contact list from contact tab
2018-04-05 11:34:26 +02:00
Rui Strecht
e8a700caab
Fixed issue with img_picto no showing icon in agenda assigned users
2018-04-03 12:13:40 +01:00
Regis Houssin
9f7fcdc8bf
Fix: multiple avoid Warning and errors
2018-04-02 10:18:51 +02:00
Alexandre SPANGARO
3779b6ff1c
Update work on assets type
2018-04-02 08:22:26 +02:00
Alexandre SPANGARO
a5428cc8c7
NEW Module Assets
2018-04-01 21:26:52 +02:00
Laurent Destailleur
99ada20f6d
Add picto bank
2018-03-29 19:08:51 +02:00
Laurent Destailleur
39f25c9fc2
Fix phpcs
2018-03-29 08:28:36 +02:00
Laurent Destailleur
1c86eb1c44
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/quarter_report.php
htdocs/core/lib/tax.lib.php
2018-03-29 03:08:01 +02:00
Laurent Destailleur
0edba4b4a7
Manage field showoncombobox
2018-03-27 23:44:49 +02:00
Laurent Destailleur
7a45527983
Generate the foreign key into key.sql file
2018-03-27 23:26:20 +02:00
Laurent Destailleur
e28307ede4
Merge pull request #8449 from hregis/develop_dict
...
NEW add "moreHtmlRef" hook
2018-03-27 18:07:57 +02:00
Regis Houssin
2b8fe93fc8
Fix: remove unused global
2018-03-27 17:40:17 +02:00
Regis Houssin
35b6cb750f
Fix: move "moreHtmlRef" hook in "showrefnav" function
2018-03-27 17:36:25 +02:00
Laurent Destailleur
51cd793d80
Fix log and duplicate vat_by_date function
2018-03-27 14:37:29 +02:00
Laurent Destailleur
b44e791c0a
Work on vat reports
2018-03-26 21:39:18 +02:00
Laurent Destailleur
c50b772b11
Clean duplicate code for payment page. Redirect on common page.
2018-03-25 19:15:55 +02:00
Laurent Destailleur
852191010a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-03-25 15:29:11 +02:00
Laurent Destailleur
53dde8dc0c
Fix confirmation email for membership payment
2018-03-25 15:00:43 +02:00
Regis Houssin
180f2a0336
Fix: multi_dir compatibility
2018-03-25 12:56:43 +02:00
Regis Houssin
d5ed29c567
NEW add "moreHtmlRef" hook
2018-03-25 12:13:29 +02:00
Laurent Destailleur
d63c8356f4
Merge pull request #8437 from hregis/7.0_bug6
...
Fix: uniformize getEntity('intervention')
2018-03-24 16:36:27 +01:00
Laurent Destailleur
224fa1c03e
Fix external links ko when substitution key are inside domain
2018-03-24 12:48:33 +01:00
Laurent Destailleur
ab9edef3c7
Fix external links ko when substitution key are inside domain
2018-03-24 12:46:52 +01:00
Laurent Destailleur
c7e93a5a3b
Serious enhancement in auto subscription for member module
2018-03-23 22:49:08 +01:00
Laurent Destailleur
53edb86ffb
Make sending of email for member module ok with new email template archi
2018-03-23 19:35:25 +01:00
Laurent Destailleur
6e32e9961f
Syn transifex
2018-03-23 17:56:35 +01:00
Laurent Destailleur
7363ae17ee
Move setup of email for module module into email templates
2018-03-23 16:09:46 +01:00
Regis Houssin
9cf66e53f6
Fix: wrong module name
2018-03-22 16:39:47 +01:00
Laurent Destailleur
700c69e127
NEW Can set position of images in module tickets
...
Mutualize code of method show_photo
2018-03-22 11:46:35 +01:00
Laurent Destailleur
6e52c896f2
Dolibarrize module ticket
2018-03-22 10:46:42 +01:00
Laurent Destailleur
35938b1942
NEW Variable __ONLINE_PAYMENT_URL__ available in email templates
2018-03-21 20:06:22 +01:00
Laurent Destailleur
7e5c3cc807
Code comment
2018-03-21 13:30:30 +01:00
Laurent Destailleur
42b0a22df2
Use font-awsome for play icon
2018-03-21 13:16:05 +01:00
Laurent Destailleur
fc50fcd59e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-20 20:07:24 +01:00
Laurent Destailleur
a3a416aa7a
Can remove comment added due to lack of test
2018-03-20 16:46:09 +01:00
Laurent Destailleur
ae17ce6f9a
NEW Add a tab to specify accountant/auditor of the company
2018-03-19 12:52:09 +01:00
Laurent Destailleur
91b3ffc3da
Merge pull request #8409 from aspangaro/8.0-a10
...
NEW Add a tab to specify accountant/auditor of the company
2018-03-19 12:40:44 +01:00
Laurent Destailleur
51b6723b08
Dolibarrize module ticket
2018-03-18 20:01:11 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
Alexandre SPANGARO
17b98b84ad
Merge remote-tracking branch 'uptream/develop' into 8.0-a10
2018-03-18 06:11:05 +01:00
Alexandre SPANGARO
93b087dbe0
NEW Add a tab to specify accountant/auditor of the company
2018-03-18 06:09:50 +01:00
Laurent Destailleur
cb1069cf0b
Use font-awesome for the picto to move/transfer a line
2018-03-17 13:21:27 +01:00
Laurent Destailleur
46e8692620
Escape db
2018-03-16 12:17:20 +01:00
arnaud
32ce42610a
FIX show status on societe banner
2018-03-16 11:18:00 +01:00
Laurent Destailleur
ba47b6d051
NEW Add tab contact on supplier proposals
2018-03-16 10:21:53 +01:00
Laurent Destailleur
8bfac66f04
Escape db
2018-03-16 09:52:45 +01:00
Laurent Destailleur
6f95a7c2b1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-15 23:48:14 +01:00
Laurent Destailleur
ce7da41bef
Fix save setup
2018-03-15 23:47:16 +01:00
Laurent Destailleur
71c51eb789
NEW Add hook printEmail
2018-03-15 22:22:42 +01:00
Laurent Destailleur
7f8f0c5dc1
Fix parameter silent was inverted
2018-03-15 21:48:51 +01:00
Laurent Destailleur
7c62f22408
Remove doubtful code
2018-03-15 14:02:32 +01:00
Laurent Destailleur
6a70d268e0
Fix SQLi reported by op7ica
2018-03-15 01:22:32 +01:00
Laurent Destailleur
c62d68f4be
Fix SQLi reported by op7ica
2018-03-15 01:21:44 +01:00
Laurent Destailleur
302fed8646
More fa image to replace png picto
2018-03-14 20:08:44 +01:00
Laurent Destailleur
cc9a6ee6e0
Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
2018-03-14 10:49:54 +01:00
Laurent Destailleur
35fbcb2c84
Update company.lib.php
2018-03-14 10:48:56 +01:00
Laurent Destailleur
da617f7d32
Can work both with remote and local payment modes
2018-03-13 22:43:50 +01:00
Laurent Destailleur
2566170c68
Use code of societeaccount
2018-03-13 17:47:43 +01:00
Laurent Destailleur
944ba69cd8
Add unique key. Dolibarrize view of stripe card.
2018-03-13 17:32:49 +01:00
Laurent Destailleur
e6d8219396
Dolibarrize module ticket
2018-03-13 13:26:03 +01:00
Laurent Destailleur
8048259733
Work on ticket module integration
2018-03-13 12:13:47 +01:00
Laurent Destailleur
0d1e26b02c
Fix error management
2018-03-12 13:19:09 +01:00
Laurent Destailleur
ae82d045f8
Dolibarrize module ticket
2018-03-11 23:56:17 +01:00
Regis Houssin
a09bad6d69
Fix: wrong year
2018-03-11 18:59:45 +01:00
Regis Houssin
7c3984c9db
Fix: dolibarrizzzz
2018-03-11 18:54:38 +01:00
Laurent Destailleur
d9b55f2275
Merge branch 'develop' into dev_ticketsup
2018-03-11 18:12:47 +01:00
Laurent Destailleur
0005b1bc48
Merge pull request #8342 from atm-florian/dev_fixscrunitiz
...
fix scrunitizer
2018-03-11 18:11:13 +01:00
florian HENRY
cfdaa7c88d
ticket sup make it work
2018-03-11 16:07:13 +01:00
florian HENRY
6d8566a238
fix scrunitizer
2018-03-11 12:41:48 +01:00
jfefe
0f96575b41
Fix PHPCS errors with ticketsup module
2018-03-11 12:06:57 +01:00
Laurent Destailleur
e14d2f08b8
Dolibarize
2018-03-11 11:12:38 +01:00
jfefe
79acb79ae0
Begin integration of module « Ticketsup »
...
Related to #4948
2018-03-11 09:44:58 +01:00
florian HENRY
888afe0e33
fix scrunitizer
2018-03-11 00:25:14 +01:00
Laurent Destailleur
65aa5953f4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-08 20:36:07 +01:00
Laurent Destailleur
bf1bada435
Contact tab after main tab
2018-03-08 20:35:50 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Laurent Destailleur
235db1f405
Enhance OAuth module to store the stripe account in llx_oauth_token
2018-03-08 19:51:18 +01:00
Laurent Destailleur
5b8006a6bb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/payment/paymentok.php
htdocs/public/paypal/paymentok.php
2018-03-08 16:37:17 +01:00
Laurent Destailleur
af9fff4f83
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-08 16:35:12 +01:00
Laurent Destailleur
3762ed12c7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2018-03-08 16:33:51 +01:00
Laurent Destailleur
343ca1bc77
Merge pull request #8294 from hregis/7.0_bug5
...
Fix: avoid conflict between invoice and invoicenumber sharings
2018-03-08 16:24:05 +01:00
Regis Houssin
861a831e24
Fix: debug
2018-03-08 11:53:46 +01:00
Laurent Destailleur
c02e8e9831
Css
2018-03-07 19:13:15 +01:00
Regis Houssin
a0774d523d
Fix: avoid conflict between invoice and invoicenumber sharings
2018-03-07 15:24:23 +01:00
Laurent Destailleur
1419eaf15f
Debug last stripe PR
2018-03-07 15:05:49 +01:00
Laurent Destailleur
d060cf840d
Merge branch 'develop' into develop
2018-03-07 13:19:25 +01:00
Laurent Destailleur
7e6ba51780
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/tasks/comment.php
2018-03-07 13:06:29 +01:00
Laurent Destailleur
004839b368
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-07 13:03:40 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
alexis Algoud
cb27eb98e1
FIX natural search double quote
2018-03-07 11:42:47 +01:00
Laurent Destailleur
23a4a60970
Fix status of task
2018-03-06 21:51:43 +01:00
ptibogxiv
10b16187d4
NEW convert rib.php to gateway.php
2018-03-06 13:26:40 +01:00
Marc de Lima Lucio
c4950d4f0c
FIX: supplier discounts: wrong source invoice ref in DOCs
2018-03-05 11:49:04 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Laurent Destailleur
6338328c90
Fix scrutinizer errors
2018-03-04 11:09:53 +01:00
Laurent Destailleur
eac1b2efe9
FIX Infinite loop on deletion of temp file when there is symbolic links
2018-03-03 11:23:23 +01:00
Laurent Destailleur
f0c9cd3acc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-03 11:22:31 +01:00
Laurent Destailleur
d6b782e5ef
FIX Infinite loop on deletion of temp file when there is symbolic links
2018-03-03 11:22:15 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany
...
Fix: use "multidir_output" instead "dir_output" (propal)
2018-03-02 17:49:25 +01:00
Marc de Lima Lucio
059801fe03
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-01 10:22:21 +01:00
Laurent Destailleur
6f29a574cf
CSS
2018-03-01 02:37:18 +01:00
Laurent Destailleur
e2c7585ae7
NEW Support alternative aliases of page name in website
2018-02-28 14:36:22 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
Laurent Destailleur
7e48db2869
Clean code
2018-02-26 15:03:09 +01:00
Regis Houssin
093ea49cc6
Fix: use "multidir_output" instead "dir_output"
2018-02-26 11:35:30 +01:00
Laurent Destailleur
1666f371bf
css
2018-02-26 00:13:16 +01:00
Laurent Destailleur
029ef534d0
Clean deprecated code (property "special" removed from mod descriptor)
2018-02-25 10:55:02 +01:00
Laurent Destailleur
a5b1f114c2
FIX Generic substitution of constant disabled for sensitive constant
2018-02-24 14:03:32 +01:00
Laurent Destailleur
1ec5a5d0bf
FIX Generic substitution of constant disabled for sensitive constant
2018-02-24 14:02:27 +01:00
Laurent Destailleur
d8bf553ea9
Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing
2018-02-23 19:55:15 +01:00
Laurent Destailleur
863cab362f
NEW Cat set the encryption algorithm for extrafields of type password
2018-02-23 14:38:41 +01:00
Laurent Destailleur
b6737d3607
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-02-23 11:24:45 +01:00
Laurent Destailleur
194f5a2cef
Fix substitution key
2018-02-23 11:03:48 +01:00
Laurent Destailleur
3f9a9f20ce
Fix missing substitution key
2018-02-22 17:06:18 +01:00
Laurent Destailleur
76543023a1
Fix missing substitution key
2018-02-22 17:05:24 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
cb644665bd
Fix output dir of grab
2018-02-20 06:02:53 +01:00
Laurent Destailleur
6ef3b330e4
Fix output dir of grab
2018-02-20 00:04:43 +01:00
Laurent Destailleur
5ada5c18f9
url in generator
2018-02-19 23:19:54 +01:00
Laurent Destailleur
1cb58a308c
Fix redirect
2018-02-19 22:25:12 +01:00
Laurent Destailleur
1f412bd1d4
Fix infinite redirects
2018-02-19 22:10:15 +01:00
Marc de Lima Lucio
44b0d1ca0f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-19 17:33:20 +01:00
Laurent Destailleur
f3114765a3
Work on website module
2018-02-19 16:46:29 +01:00
Marc de Lima Lucio
f5ad93b272
NEW: supplier credit notes: handle Excess Paid + translation
2018-02-19 15:52:07 +01:00
Laurent Destailleur
60a77a6d85
Add option to grab images into same dir or subdir
2018-02-19 14:56:37 +01:00
Laurent Destailleur
60fe1fa503
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/mails.php
2018-02-17 01:19:17 +01:00
Laurent Destailleur
ab6d0d2530
Fix errors
2018-02-17 01:16:52 +01:00
Laurent Destailleur
9bed2ce8e2
Fix ignore file integrity check on filefunc.inc.php for deb/rpm package
2018-02-16 22:03:13 +01:00
Marc de Lima Lucio
e2b65b3755
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note
2018-02-16 09:14:53 +01:00
Laurent Destailleur
03e58f86f3
Merge pull request #8199 from dolibarr95/patch-37
...
Fix : Bad copy/paste in var name
2018-02-15 17:28:46 +01:00
Laurent Destailleur
4f0ba4982b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-15 15:34:35 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
5eee292663
FIX #8189
2018-02-15 13:40:17 +01:00
dolibarr95
634f3bc025
Bad copy/paste
2018-02-15 13:38:21 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
dolibarr95
3ffc671052
Add phone format for several countries
2018-02-15 10:47:32 +01:00
Laurent Destailleur
dde5c186e7
Fix duplicate html tag
2018-02-15 00:53:03 +01:00
Laurent Destailleur
b789a50ce6
Fix duplicate html tag
2018-02-15 00:38:11 +01:00
Laurent Destailleur
bab5c41b98
Fix duplicate html tag
2018-02-15 00:24:15 +01:00
Marc de Lima Lucio
4f9bb33600
NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid
2018-02-14 10:47:10 +01:00
Laurent Destailleur
434980bb22
Fix svg image preview ko
2018-02-13 18:15:39 +01:00
Laurent Destailleur
92e67ebb8f
Fix svg image preview ko
2018-02-13 16:33:45 +01:00
Laurent Destailleur
8a32ae6935
Move ajax_autoselect into functions.lib.php
2018-02-13 15:46:39 +01:00
Laurent Destailleur
1a4aa89489
NEW Can share any file from the "Document" tab.
2018-02-13 13:55:36 +01:00
Laurent Destailleur
36ac380cac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 22:26:48 +01:00
Laurent Destailleur
a4f48fcfb6
Fix feature must be hidden (not stable)
2018-02-12 16:09:22 +01:00
Laurent Destailleur
b2835fc803
Fix check of vat only for european countries
2018-02-12 15:54:24 +01:00
Laurent Destailleur
109c447171
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 03:21:37 +01:00
Laurent Destailleur
c03ceb2205
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-02-12 02:56:51 +01:00
Laurent Destailleur
f88874c1f7
Code comment
2018-02-12 02:53:08 +01:00
Laurent Destailleur
ec66bde3c9
Add option WEBSITE_USE_WEBSITE_ACCOUNTS
2018-02-10 12:15:24 +01:00
Laurent Destailleur
2315997aad
CSS enhancement
2018-02-10 00:00:12 +01:00
Laurent Destailleur
e984d7df9f
NEW Add total of time spent in timespent page at top of page too.
2018-02-09 23:52:43 +01:00
Laurent Destailleur
633dc507fe
NEW Use a css style for weekend in time spent
2018-02-09 20:11:32 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Rui Strecht
3a7cb43ad5
Forgot withregion condition if we want no state code
2018-02-07 16:06:58 +00:00
jh z
131eed97a1
New: Add a tab of Docments to expedition module
2018-02-07 22:56:14 +08:00
Rui Strecht
31372f8948
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/core/class/commonobject.class.php
2018-02-06 10:26:38 +00:00
Laurent Destailleur
ea92f6beae
Fix for multicompany
2018-02-06 10:57:53 +01:00
Laurent Destailleur
51847dfa8a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2018-02-05 15:34:50 +01:00
arnaud
3c816acb05
FIX order contactlist on Thirdparty by name
2018-02-05 15:06:28 +01:00
Laurent Destailleur
8fe773204e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-04 23:18:33 +01:00
Laurent Destailleur
5455ab3280
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/projet/card.php
2018-02-04 23:17:09 +01:00
Laurent Destailleur
0cc6654b06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2018-02-04 13:25:00 +01:00
Laurent Destailleur
fd8f89c708
FIX a discount is a percent, not an amount, so we use vatrate not price
2018-02-04 11:13:47 +01:00
Laurent Destailleur
c6fba7273d
Api interventions
2018-02-03 20:58:26 +01:00
Laurent Destailleur
2e705b5a88
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-02 10:41:20 +01:00
Laurent Destailleur
d3a6342034
Fix regeneration of PDF after creation of payment.
2018-02-02 10:37:10 +01:00
Laurent Destailleur
f51d6a2e50
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-02 10:07:16 +01:00
Laurent Destailleur
b2536d8ebb
FIX #8110
2018-02-01 15:44:35 +01:00
Laurent Destailleur
7f9d6a5458
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
de0a8ba71f
Fix extrafields
2018-01-31 14:01:58 +01:00
Rui Strecht
75b9caf744
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2018-01-31 11:19:39 +00:00
Laurent Destailleur
bbcc1e54d5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-01-30 18:03:26 +01:00
Laurent Destailleur
f761c9efab
Add param morecss on error message
2018-01-30 18:02:24 +01:00
Laurent Destailleur
d6317a26d2
Fix for multicompany
2018-01-30 15:48:09 +01:00
Laurent Destailleur
0d90ab0c6c
Fix when counter is corrupted in database
2018-01-30 14:42:13 +01:00
Laurent Destailleur
06f2382e39
Fix compatibility with old actioncomm record
2018-01-30 11:05:11 +01:00
Laurent Destailleur
6fb90682cf
Merge pull request #7931 from grandoc/new_branch_09_12_17
...
enhance image using awesome icon
2018-01-30 00:08:42 +01:00
Laurent Destailleur
fec551631e
Merge pull request #8066 from grandoc/new_push_16_01_2018
...
NEW Add linked file tab to vat
2018-01-29 21:28:14 +01:00
Laurent Destailleur
bee64962fe
Fix css
2018-01-27 19:40:11 +01:00
Laurent Destailleur
a61b420759
Fix css
2018-01-26 23:29:49 +01:00
Laurent Destailleur
e379b02b81
Merge pull request #8009 from dolibarr95/patch-33
...
NEW add a hook in dol_print_phone
2018-01-26 18:02:27 +01:00
Laurent Destailleur
ae1641f4b9
Merge pull request #8063 from Alabate/develop
...
NEW : Add password_hash as hash algorithm
2018-01-26 18:01:13 +01:00
Laurent Destailleur
6cae36cc33
NEW Add key __USER_REMOTE_IP__ into available substitution variables
2018-01-26 17:23:30 +01:00
Laurent Destailleur
82c2079d40
Fix var not initialized
2018-01-26 10:23:24 +01:00
Laurent Destailleur
c922498e79
Code comment
2018-01-25 20:35:25 +01:00
Laurent Destailleur
8d7f6843a4
Must be able to export lockedlog for a dedicated year.
...
Fix date are nto humanly readable.
2018-01-25 12:57:36 +01:00
Laurent Destailleur
005bccc63d
Fix missing badge of nb of permissions
2018-01-25 12:06:22 +01:00
Laurent Destailleur
9cdb7f0f27
Code comment
2018-01-24 14:37:26 +01:00
Laurent Destailleur
7a1a2cf90d
Fix send into ledger for bank line record. Show accounted status.
2018-01-22 04:13:29 +01:00
Laurent Destailleur
273e88a599
Fix send into ledger for expense report. Show accounted status.
2018-01-22 03:07:11 +01:00
Laurent Destailleur
3987033aab
Fix substitution in public notes of pdf
2018-01-21 20:53:36 +01:00
Laurent Destailleur
dcd579242f
Fix <br /> (xml) into <br> (html)
2018-01-17 13:26:57 +01:00
Laurent Destailleur
26ba0a9ec2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cashdesk/index.php
htdocs/compta/index.php
htdocs/core/lib/security.lib.php
htdocs/societe/list.php
2018-01-16 20:23:32 +01:00
Laurent Destailleur
94b1d59f2b
Fix missing check on object entity
2018-01-16 19:52:14 +01:00
Laurent Destailleur
59eefa46e6
Fix duplicate search field
2018-01-16 18:02:36 +01:00
Philippe GRAND
cd0dc2dbde
Add linked file tab to vat
2018-01-16 16:22:32 +01:00
Laurent Destailleur
926683763b
Modulebuilde fix sort of fields, fix generation of files
2018-01-15 17:38:15 +01:00
Laurent Destailleur
193dfec29e
Merge pull request #8061 from fappels/7.0_fix_module_builder
...
7.0 fix module builder
2018-01-15 11:32:40 +01:00
Aurélien Labate
b86a5d5623
FIX add password_hash compatibility test for PHP < 5.5
2018-01-15 11:02:08 +01:00
Aurélien Labate
8088d92bbb
NEW Add password_hash as hash algorithm
2018-01-15 00:33:25 +01:00
Laurent Destailleur
90fc086814
Fix minor
2018-01-14 20:11:38 +01:00
Laurent Destailleur
cc5dcde9e1
Fix protection to avoid errors
2018-01-14 18:55:55 +01:00
fappels
d6ed968c51
html modulebuilder type is a text type in database
2018-01-14 15:41:37 +01:00
Laurent Destailleur
f0d6099e5f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/DoliDB.class.php
htdocs/core/lib/functions.lib.php
2018-01-14 03:15:49 +01:00
Laurent Destailleur
9f6118ed52
Code comments
2018-01-14 03:12:22 +01:00
Laurent Destailleur
7a087327e1
Fix deprecated code
2018-01-13 19:33:40 +01:00
Laurent Destailleur
c947502efa
Fix typo
2018-01-13 17:22:59 +01:00
Laurent Destailleur
7c480f76e3
Fix thumbs of pdf at wrong place
...
Fix param not provided
Fix css
2018-01-13 16:09:05 +01:00
Laurent Destailleur
8d793c680e
Fix dol_delete_preview
2018-01-13 15:48:30 +01:00
Laurent Destailleur
7bfcfd4574
Fix recursive path when dir is '0'
2018-01-12 17:12:38 +01:00
Laurent Destailleur
95d2a9f88d
Responsive and css
2018-01-12 01:10:03 +01:00
Laurent Destailleur
46d28deee7
Fix substitution of thirdparty
2018-01-11 12:25:40 +01:00
Laurent Destailleur
3f4d7dbce6
Fix substitution of thirdparty
2018-01-11 12:24:47 +01:00
Laurent Destailleur
af6b84ba3a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
2018-01-11 01:03:13 +01:00
Laurent Destailleur
f83ea80d6a
Merge pull request #8041 from dolibarr95/patch-35
...
NEW Add class in societe/card.php
2018-01-11 00:47:53 +01:00
Laurent Destailleur
436b653fa0
Error report
2018-01-11 00:16:45 +01:00
Laurent Destailleur
167ab17927
Fix substitution of user_signature
2018-01-10 10:31:27 +01:00
dolibarr95
6fdbd4cc17
Update company.lib.php
2018-01-09 14:29:01 +01:00
dolibarr95
b9b42e3e9d
Add class
...
Add oddeven class to show_contacts() list.
2018-01-09 14:04:18 +01:00
Laurent Destailleur
86227d77d6
Fix link of images
2018-01-08 01:37:10 +01:00
Laurent Destailleur
c13a7709f5
Fix link on image for website module
2018-01-08 00:20:38 +01:00
Laurent Destailleur
de94c77a98
Fix url to alias when dolibarr is server for website module
2018-01-07 20:32:59 +01:00
Paul Dermody
a1ac285a25
Fixed automated computation of surface and volume to use correct units. It was failing for inches and feet.
2018-01-07 12:42:14 -06:00
Laurent Destailleur
dbf7603118
Debug blockedlog for loi finance 2016
2018-01-05 04:31:48 +01:00
Laurent Destailleur
07d991cc8d
Code comment
2018-01-05 01:27:48 +01:00
Laurent Destailleur
6e9e4e13c1
Code comment
2018-01-05 01:26:57 +01:00
Laurent Destailleur
21506f25b9
Merge pull request #8022 from OPEN-DSI/core_access_rights_resource_multientities
...
Fix: Access rights for resource in multi-entities
2018-01-04 21:03:55 +01:00
Laurent Destailleur
e10a9912dc
Fix missing worload
2018-01-04 19:54:30 +01:00
KHELIFA
7d824b3ef2
Fix: Access rights for resource in multi-entities
2018-01-04 15:05:11 +01:00
Laurent Destailleur
48261f793d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/admin/product.php
2018-01-03 20:21:10 +01:00
Laurent Destailleur
ca14dd790b
Fix module website
2018-01-02 22:58:37 +01:00
Laurent Destailleur
c98b5c7ec7
Fix css background
2018-01-02 17:27:05 +01:00
dolibarr95
3438cfb1e7
Update functions.lib.php
...
syntax error $withpicto
2018-01-02 11:48:41 +01:00
dolibarr95
e794a3b321
Update functions.lib.php
...
add more parameters and add if empty
2018-01-02 11:44:54 +01:00
dolibarr95
ab896dc49d
Update functions.lib.php
2018-01-02 11:39:00 +01:00
dolibarr95
12e414509c
Add a hook in dol_print_phone
...
To allow more controls in this print function as in dol_print_address (there is a hook so we can create links to maps...).
Eg : create a other click to dial functions (different from dolibarr ones with more parameters, because each provider give differents api ) etc
Hope this one will be accepted and usefull for the community.
And happy new year :)
2018-01-02 11:24:28 +01:00
Laurent Destailleur
6f107e3fee
Fix API to download/build doc
2017-12-27 15:48:20 +01:00
Regis Houssin
59a89b250d
Fix: avoid warning ( https://github.com/Dolibarr/dolibarr/issues/7993 )
2017-12-27 11:56:58 +01:00
Laurent Destailleur
57272dc5fe
API to get list of available document is ok for invoice
...
order, proposal, shipment
2017-12-22 19:49:31 +01:00
Laurent Destailleur
493669e986
Fix look and feel v7
2017-12-22 14:19:12 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
d20062df73
Fix jquery css theme
2017-12-20 20:18:41 +01:00
Laurent Destailleur
12d91d7444
Fix missing messages in error report.
...
Fix test on non empty array
2017-12-19 18:26:27 +01:00
Laurent Destailleur
feaff433b8
Debug module website
2017-12-19 12:54:10 +01:00
Laurent Destailleur
89a62103ca
Debug module website
2017-12-19 11:40:29 +01:00
Laurent Destailleur
d4afb8300d
Fix several pb of duplicate functions in some cases
2017-12-19 00:15:22 +01:00
Laurent Destailleur
2204790602
Fix filter on project id when id is list with comma
2017-12-18 19:04:57 +01:00
Laurent Destailleur
1351a43a30
FIX Maxi debug of permission for users external or restricted to sales
...
representatives
2017-12-18 16:13:05 +01:00
Laurent Destailleur
54db0d31b4
Fix GETPOST for intcomma
2017-12-18 11:32:24 +01:00
Laurent Destailleur
8d671b2b26
Debug website module
2017-12-17 16:24:47 +01:00
Laurent Destailleur
2163db446b
NEW Can test signature of a version from API
2017-12-16 17:24:23 +01:00
Laurent Destailleur
9cdf322bfb
Fix scrutinizer bugs
2017-12-15 22:14:28 +01:00
Laurent Destailleur
e774beffc3
Fix the symbol of Yuan must be before amount
2017-12-15 17:17:35 +01:00
Laurent Destailleur
5af153550d
Debug blockedlog:
...
- Add a track into log when we disable/enable module
- Add a protection to avoid disable of module when recording was started
- Better compatibility with multicompany
- Can filter on ref and amount
- Add a permission to read the blockedlog
- Add more information on payments/invoice/thirdparty into log
- Reset of module data after a migration from v6 (not compatible)
2017-12-15 16:56:08 +01:00
Laurent Destailleur
2eea3a1afa
Fix backlink of module setup pages
2017-12-15 10:36:35 +01:00
Laurent Destailleur
427f1490f8
Fix css
2017-12-14 13:52:32 +01:00
Laurent Destailleur
247c380d18
Several fixes
2017-12-12 16:11:40 +01:00
Laurent Destailleur
f886aac75a
Merge pull request #7944 from lampi87/develop
...
public holiday in austria
2017-12-12 14:59:23 +01:00
Laurent Destailleur
06e63615e3
complete api detection
2017-12-12 13:05:22 +01:00
Laurent Destailleur
9880ef7364
Fix module website
2017-12-12 01:40:34 +01:00
Laurent Destailleur
48aada6090
Export of website
2017-12-11 21:27:43 +01:00
Laurent Destailleur
bb7c03906e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
2017-12-11 15:25:09 +01:00
Laurent Destailleur
48499fb506
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-12-11 15:21:22 +01:00
Laurent Destailleur
f2e429e28f
Fix file integrity checker (exclude files excluded from package)
2017-12-11 15:03:34 +01:00
Laurent Destailleur
acf2d2ee9a
Fix scrutinizer reported bugs
2017-12-11 11:48:11 +01:00
Alexander Lampret
46aeb7068c
public holiday in austria
2017-12-11 10:51:58 +01:00
Laurent Destailleur
066e04f33d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2017-12-11 00:22:05 +01:00
Laurent Destailleur
dbd96d1ac7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
2017-12-10 21:46:23 +01:00
Laurent Destailleur
4017d09613
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-12-10 21:28:36 +01:00
Laurent Destailleur
f18edd5787
Update security.lib.php
2017-12-10 21:08:13 +01:00
Laurent Destailleur
7d553f58f5
Debug website module
2017-12-10 20:34:35 +01:00
patrick Delcroix
033016da7f
fix: unable to remove salaries, plus correct default rights management
2017-12-10 20:02:26 +01:00
Laurent Destailleur
2dae21259e
Fix the switch show more/less
2017-12-10 19:03:18 +01:00
Laurent Destailleur
e1f0483b23
Fix grabber of url when url is on second level dir. More phpunits
2017-12-10 17:59:19 +01:00
Laurent Destailleur
02d9e93ed4
Fix badge and use of data-html instead of html tag
2017-12-10 15:46:35 +01:00
Laurent Destailleur
4443c0f0a0
Fix style
2017-12-10 15:24:47 +01:00
Maxime Kohlhaas
3db4d10fc0
Fix event late alert on third event list #7912
2017-12-10 08:12:49 +01:00
Laurent Destailleur
e3dcff7f5b
Fix substition for menus title and urls
2017-12-09 15:35:01 +01:00
Philippe GRAND
8fa7b924d5
enhance image using awesome icon
2017-12-09 12:08:50 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
56b5eab2e4
Merge pull request #7911 from atm-alexis/NEW_blockedlog_reset_warning
...
NEW warning on module blocked log reset if country code is FR
2017-12-08 13:47:44 +01:00
alexis Algoud
62cd77d999
NEW automatic activation of external module on country set
2017-12-08 10:13:03 +01:00
Laurent Destailleur
cf5265d405
Minor fix
2017-12-07 21:44:12 +01:00
Laurent Destailleur
c6e1087834
Fix test on vat amount
2017-12-05 19:47:46 +01:00
Laurent Destailleur
78c4b7f912
Fix look and feel v7
2017-12-04 20:17:07 +01:00
Laurent Destailleur
2458244ee3
Fix css
2017-12-02 16:24:38 +01:00
Laurent Destailleur
7b47ef3ca1
Change order or field
2017-12-02 11:34:56 +01:00
Laurent Destailleur
e8327fd9a1
Fix the eatby/sellby date was not visible.
2017-12-02 10:43:01 +01:00
Laurent Destailleur
46b281f703
Fix for #7697
2017-12-01 19:29:29 +01:00
Laurent Destailleur
89ef597690
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-12-01 18:12:52 +01:00
Laurent Destailleur
4969ae2abb
Fix missing the badge on virtual product tab
2017-12-01 17:48:51 +01:00
Laurent Destailleur
e36b62f539
Merge pull request #7900 from fappels/7.0_fix_warehouse_label_ref-
...
Fix dispatch not adapted for label to ref change for warehouse
2017-12-01 16:26:21 +01:00
fappels
1c72dc608f
Fix travis
2017-12-01 16:22:34 +01:00
Laurent Destailleur
1d2b5dbe97
Merge pull request #7892 from atm-maxime/fix_contactlist_empty
...
Fix filters on contact list must always appear
2017-12-01 15:54:03 +01:00
Laurent Destailleur
670465fcd8
Fix responsive and search
2017-12-01 12:01:17 +01:00
Laurent Destailleur
6796c08cb8
Debug/rewrite Blockedlog
2017-11-30 14:21:55 +01:00
Maxime Kohlhaas
879a0812d7
Fix filters on contact list must always appear
2017-11-29 20:04:15 +01:00
Laurent Destailleur
9fa6bfd1a5
Fix edit external user or not
2017-11-29 15:30:41 +01:00
Laurent Destailleur
a15a57317b
Debug accountancy module
2017-11-28 11:12:13 +01:00
Laurent Destailleur
533a82187a
NEW Add a protection so we can't journalize non balanced transactions
2017-11-27 17:12:48 +01:00
Scrutinizer Auto-Fixer
aab2799981
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-11-27 13:48:36 +00:00
Laurent Destailleur
a0406bc741
Standardize view of events for products
2017-11-26 20:24:20 +01:00
Laurent Destailleur
7e40ee5e4b
Fix substitution key for constant ok with php 5.3
2017-11-25 23:16:15 +01:00
Laurent Destailleur
c02528a479
NEW Accept substitution key __[ABC]__ replaced with value of const ABC
2017-11-25 19:55:31 +01:00
Laurent Destailleur
2fc5d9fefb
The form to test email can now use all sending profiles.
2017-11-25 18:52:47 +01:00
Laurent Destailleur
0b9a3087ea
Fix bug reported by scrutinizer
2017-11-25 12:11:02 +01:00
Laurent Destailleur
4cff4c6935
Simplify and standardize code for agenda pages
2017-11-25 00:12:45 +01:00
Laurent Destailleur
3db52b5f9e
Debug responsive of v7
2017-11-24 14:23:25 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
b0cecab22b
Removed useless code
2017-11-22 21:26:24 +01:00
Laurent Destailleur
240f67d82b
Disable tab if not on develop mode
2017-11-22 21:23:42 +01:00
Laurent Destailleur
5fa8db1650
Work on timesheets
2017-11-22 21:19:40 +01:00
Laurent Destailleur
c3d8ef2104
Update functions.lib.php
2017-11-22 11:14:52 +01:00
Regis Houssin
a9bfe0f48f
Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876)
2017-11-22 10:12:51 +01:00
Regis Houssin
848a27283b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member
2017-11-22 09:51:57 +01:00
Regis Houssin
1595bb1148
NEW add possibility to remove address field
2017-11-22 09:51:46 +01:00
Laurent Destailleur
4b4412d5da
Standardize file names for ECM
2017-11-20 19:40:34 +01:00
Laurent Destailleur
e19ca7b6d4
Work on generic filemanager
2017-11-20 18:19:41 +01:00
Laurent Destailleur
304819a726
Work on module builder
2017-11-19 16:26:39 +01:00
Laurent Destailleur
80bdb45be8
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:48:16 +01:00
Laurent Destailleur
742bf29c65
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:29:42 +01:00
Laurent Destailleur
2cb190fc5c
Fix return code
2017-11-17 15:27:59 +01:00
Laurent Destailleur
ead629708c
Look and feel v6
2017-11-17 14:57:14 +01:00
Laurent Destailleur
405275693f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/replenishorders.php
htdocs/projet/activity/perday.php
2017-11-17 14:20:08 +01:00
Laurent Destailleur
68f477eaf7
Merge pull request #7818 from dolibarr95/patch-29
...
Fix : syntax error in dol_print_graph()
2017-11-17 13:18:11 +01:00
Laurent Destailleur
e06087888b
NEW Show line "other filtered task" when using filter on timesheet.
2017-11-16 22:55:04 +01:00
Laurent Destailleur
f153d9c9ff
Fix time spent counted twice
2017-11-16 19:41:31 +01:00
Laurent Destailleur
4f25bc5e3b
NEW detection of edge browser
2017-11-16 14:44:55 +01:00
Laurent Destailleur
c527189088
Standardize page name
2017-11-16 12:18:25 +01:00
dolibarr95
c6c1552c01
syntax error
...
bad syntax when add an url in dol_print_graph()
2017-11-15 11:11:45 +01:00
Laurent Destailleur
451d3ed8ed
NEW Add API to activate/unactivate a contract
2017-11-14 17:51:04 +01:00
florian HENRY
e195cf0b95
fix : return vat code for supplier price
2017-11-14 09:53:06 +01:00
Laurent Destailleur
97c9549087
Fix ref supplier must be output if it exists, even for free products
2017-11-13 11:30:41 +01:00
Laurent Destailleur
f33182acc5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-12 20:49:53 +01:00
Laurent Destailleur
356525730d
FIX #7786
2017-11-12 20:12:56 +01:00
Laurent Destailleur
955ed7dbbf
NEW Show the supplier ref into supplier cards
2017-11-12 15:30:21 +01:00
Laurent Destailleur
186c8cdbf0
Fix selection of contact into creation of event
2017-11-12 13:40:05 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
cba3a3846f
Merge pull request #7790 from frederic34/facrecmodelpdf
...
NEW generate also document when invoice is build from recurring template
2017-11-11 17:42:26 +01:00
Laurent Destailleur
cb6bf91044
Merge pull request #7787 from libersoft/feature/correct-italian-address-format
...
NEW Support Italian addresses format. Fixes #7785
2017-11-11 17:38:29 +01:00
Laurent Destailleur
01a41237bf
CSS
2017-11-11 14:20:08 +01:00
Laurent Destailleur
debc0480dd
CSS
2017-11-10 20:20:59 +01:00
Laurent Destailleur
c2d7b88bdd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-10 13:51:59 +01:00
Laurent Destailleur
ab78007a54
Work on filemanager generic component
2017-11-10 13:45:38 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs
2017-11-09 23:39:28 +01:00
Laurent Destailleur
9b07f33649
Clear code
2017-11-09 09:50:55 +01:00
Laurent Destailleur
d18f65a6e2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions.lib.php
2017-11-09 01:25:41 +01:00
Laurent Destailleur
ad71a22994
Code comment
2017-11-09 01:21:02 +01:00
Laurent Destailleur
c8a551e7de
Reorganize javascript at end of page.
2017-11-09 01:00:43 +01:00
Valerio Baldisserotto
15a501467e
FR: Support Italian address format. Fixes #7785
2017-11-08 11:43:52 +01:00
Laurent Destailleur
e7abc92f97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/transfer.php
htdocs/core/lib/functions.lib.php
2017-11-06 21:37:19 +01:00
Laurent Destailleur
bc093ef969
FIX #7775 Order of deletion in delete method (trigger first)
2017-11-06 19:27:10 +01:00
Laurent Destailleur
bc9b816719
Fix deletion of files that contains __
2017-11-06 17:54:18 +01:00
Laurent Destailleur
864af9cc3b
Fix error not returned if output directory not writable
2017-11-06 11:47:03 +01:00
Laurent Destailleur
ea5dd3eb3d
NEW Add REST API for supplier proposals
2017-11-06 11:06:31 +01:00
Laurent Destailleur
534c50f46e
Move api that are admin features into a dedicated /admin api
2017-11-06 09:55:31 +01:00
Laurent Destailleur
7139cbb490
Fix regression
2017-11-05 19:00:43 +01:00
Laurent Destailleur
fd8f65341b
Merge pull request #7765 from bomuux/patch-3
...
Fix: vat reports now include expense reports vat
2017-11-05 18:37:25 +01:00
Laurent Destailleur
1e939ec90c
Merge pull request #7761 from hregis/develop_member
...
Fix: broken feature (add more attr and css class)
2017-11-05 18:33:43 +01:00
Laurent Destailleur
202d36d582
Work on modulebuilder
2017-11-05 18:15:59 +01:00
Laurent Destailleur
e4ba6cfa10
Debu website module
2017-11-05 03:57:26 +01:00
Laurent Destailleur
c78c06776b
Fix bug reported by scrutinizer
2017-11-05 03:39:27 +01:00
Laurent Destailleur
91950ccbc7
Fix regression in getRandomPassword
2017-11-05 03:03:17 +01:00
Laurent Destailleur
05ee3e3825
Fix show message "files uploaded" only once even when n files.
2017-11-05 01:06:34 +01:00
Laurent Destailleur
bac6a434f4
Add link to make a direct download on card
2017-11-04 17:11:58 +01:00
bomuux
0a2d8a820b
FIX: make vat reports work with expensereports
...
function tax_by_date : Fixed sql query for expense reports vat, now returning pad vat for expense report, previously returning nothing.
2017-11-03 21:06:56 +01:00
Laurent Destailleur
e78406e120
Debug cronjob
2017-11-03 20:04:18 +01:00
Laurent Destailleur
f32f3ff17f
Better default function to generate passwords
2017-11-03 18:02:17 +01:00
Laurent Destailleur
a346a1a5e9
Work on website module
2017-11-03 15:56:16 +01:00
Regis Houssin
2d4717b745
Fix: broken feature (add more attr and css class)
2017-11-03 14:46:45 +01:00
Laurent Destailleur
fa1fbe7db7
Work on websiteaccounts
2017-11-03 13:25:49 +01:00
Laurent Destailleur
ce3e586bd0
Fix doxygen
2017-11-03 11:44:31 +01:00
Laurent Destailleur
2a2c0aaa5f
Clean and debug code to execute CLI commands
2017-11-02 20:17:27 +01:00
Laurent Destailleur
f5e1ca3178
Fix break on project
2017-11-02 15:33:04 +01:00
Laurent Destailleur
cfacfab6cf
NEW Show badge with nbr of shipment on shimpen tab of order
...
NEW Add button cancel on shipment creation
2017-11-02 12:38:36 +01:00
Laurent Destailleur
dbd85321b3
Merge pull request #7735 from grandoc/new_branc_30_10_17
...
Warning: trim() expects parameter 1 to be string, array given in /htt…
2017-11-02 09:58:57 +01:00
Laurent Destailleur
6ea558b639
Update functions.lib.php
2017-11-02 09:58:22 +01:00
Laurent Destailleur
f26d970d58
Remove option MAIN_HTML5_PLACEHOLDER (on by default now)
2017-11-01 10:17:24 +01:00
Laurent Destailleur
9458c80c48
Work on reminders
2017-10-31 23:10:29 +01:00
Laurent Destailleur
d39a19e976
Replace on/off img tick with fa-font
2017-10-31 12:32:30 +01:00
Laurent Destailleur
bd94ec0f1d
Use fontawesome for picto for on/off default.
2017-10-31 12:25:06 +01:00
Laurent Destailleur
068f5e32cb
NEW Tooltip for substitutions variables on tooltips on admin pages
2017-10-31 11:17:44 +01:00
Laurent Destailleur
b29f32171c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/action/class/actioncomm.class.php
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/filefunc.inc.php
2017-10-30 18:22:26 +01:00
Philippe GRAND
f904c46a10
Warning: trim() expects parameter 1 to be string, array given in /httpdocs/core/lib/functions.lib.php on line 520
2017-10-30 14:22:34 +01:00
Laurent Destailleur
33aa0f3160
Code comment
2017-10-29 17:49:24 +01:00
Laurent Destailleur
cd5e43483e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/expedition/card.php
htdocs/projet/class/task.class.php
2017-10-28 22:08:16 +02:00
Laurent Destailleur
adc4db0f85
Standardize code
2017-10-28 16:55:25 +02:00
Laurent Destailleur
9676b83574
Google tag enabled also on mobile
2017-10-28 16:00:46 +02:00
Laurent Destailleur
9e382a7f1b
Can disabled output of notify messages
2017-10-28 13:36:23 +02:00
Laurent Destailleur
9a5d532786
Fix website
2017-10-27 18:45:12 +02:00
Laurent Destailleur
013ab9405e
Work on website module
2017-10-27 17:58:38 +02:00
Laurent Destailleur
01af1e3252
Work on website module
2017-10-27 15:42:48 +02:00
Laurent Destailleur
f02e731c67
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/project.lib.php
2017-10-27 02:32:09 +02:00
Laurent Destailleur
fed0f3d09e
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/lib/project.lib.php
htdocs/projet/class/task.class.php
2017-10-27 02:30:33 +02:00
Laurent Destailleur
90bd9f2f4f
Fix trad
2017-10-26 20:57:23 +02:00
Laurent Destailleur
a1f862eba6
NEW Enhance framework so we can use html/icons into SELECT options.
2017-10-26 20:06:23 +02:00
Laurent Destailleur
67e5d72bd0
Fix doxygen
2017-10-26 14:56:07 +02:00
Laurent Destailleur
82b333e423
Fix migration to select2 4.0.5
2017-10-26 14:06:23 +02:00
Laurent Destailleur
5f5cbec1cf
Debug module website
2017-10-26 13:09:11 +02:00
Laurent Destailleur
6d6c4bf088
Fix export web site
2017-10-26 10:43:47 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
f381361c8b
Work on modulebuilder
2017-10-24 19:57:36 +02:00
Laurent Destailleur
53d2f29cdd
Fix regression
2017-10-23 10:27:50 +02:00
Laurent Destailleur
f4f47c6732
NEW Remove tooltip tipTip library replaced with standatd jquery tooltip
2017-10-22 21:15:08 +02:00
Laurent Destailleur
efb369f857
Merge pull request #7497 from atm-florian/dev_accountancy
...
NEW : lettrage in accountancy
2017-10-22 15:28:53 +02:00
Laurent Destailleur
b9bbba813a
Update company.lib.php
2017-10-22 15:28:03 +02:00
Laurent Destailleur
fb843430bf
FIX #7671
2017-10-22 03:22:31 +02:00
Laurent Destailleur
dbcf3ddbe8
NEW Upgrade jquery select2 to 4.0.4
2017-10-21 19:05:24 +02:00
Laurent Destailleur
1426737a26
Work on website
2017-10-21 12:26:14 +02:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Laurent Destailleur
3bca0ad07d
More modern picto for switch on/off
...
Work on website module
2017-10-20 21:39:19 +02:00
Laurent Destailleur
ab4f5a3aea
Clean code
2017-10-20 18:15:43 +02:00
Laurent Destailleur
985675d680
Clean code
2017-10-20 18:04:46 +02:00
Laurent Destailleur
d82af57b57
NEW Add tab "Expense report" on user card
2017-10-19 20:56:23 +02:00
Laurent Destailleur
abd5251330
Better responsive
2017-10-19 19:53:29 +02:00
Laurent Destailleur
9c45e86a1c
Introduce main_doc into table of objects to know what is main doc.
...
Work on option PROPOSAL_USE_ONLINE_SIGN
2017-10-19 11:40:40 +02:00
gauthier
3793ae323a
FIX : wrong personnal project time spent
2017-10-19 09:46:19 +02:00
florian HENRY
63f3ac2f2b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_accountancy
2017-10-18 14:49:06 +02:00
Laurent Destailleur
69b131b919
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/societe/class/api_thirdparties.class.php
2017-10-18 11:28:20 +02:00
florian HENRY
4273e507c5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into
...
dev_accountancy
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
htdocs/accountancy/class/lettering.class.php
2017-10-18 09:52:56 +02:00
Laurent Destailleur
aa1ff189e1
Fix var not correctly initialized when using api + multicompany
2017-10-17 12:58:26 +02:00
Laurent Destailleur
41464bf5ac
Merge pull request #7633 from defrance/patch-101
...
template file not only odt/ods
2017-10-16 20:25:20 +02:00
Rui Strecht
447cc208fe
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/societe/class/societe.class.php
2017-10-16 09:34:24 +01:00
Laurent Destailleur
87814af7b6
Move function colorIsLight into functions.lib.php
...
Fix scrutinizer bugs.
2017-10-16 09:29:10 +02:00
Laurent Destailleur
afdc176f47
Fix scrutinizer
2017-10-16 08:52:00 +02:00
BENKE Charlene
c44207f7d3
template file not only odt/ods
2017-10-14 12:39:39 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
8113321062
Start to work on email sender profiles
2017-10-13 12:02:26 +02:00
Laurent Destailleur
2b55fb81b9
Standardize substition keys.
2017-10-13 10:35:21 +02:00
Laurent Destailleur
6497ca5394
prepare tzuserrel
2017-10-12 18:14:02 +02:00
Laurent Destailleur
50da6a0c9e
Prepare code for removing adodb
2017-10-12 14:59:38 +02:00
Laurent Destailleur
3f36cf23f5
NEW Break lines per project on the new timesheet page
2017-10-12 13:17:22 +02:00
Laurent Destailleur
cf3dd4be12
Merge pull request #7606 from dolibarr95/patch-23
...
NEW More picto for phone
2017-10-11 11:51:07 +02:00
Laurent Destailleur
eb75c2f98e
Merge pull request #7596 from hregis/develop_bug2
...
Fix: wrong POST GET name
2017-10-11 11:30:36 +02:00
dolibarr95
572a64bdbf
display mobile picto
...
runs with #6617
2017-10-10 10:19:04 +02:00
Laurent Destailleur
9427655dd0
Option PROJECT_LINES_PERxxx_SHOW_THIRDPARTY is the default
2017-10-09 18:18:34 +02:00
Laurent Destailleur
084dc7798d
Standardize use of function getCommonSubstitutionArray
2017-10-09 14:51:42 +02:00
Rui Strecht
1a5cdf2406
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/admin/company.php
# htdocs/core/class/commonobject.class.php
2017-10-09 11:36:38 +01:00
Regis Houssin
64d9b625ff
Fix: wrong POST GET name
2017-10-09 11:03:16 +02:00
Laurent Destailleur
245c048b40
Merge pull request #7577 from OPEN-DSI/fix_0001
...
Fix carriage return when get full address formated for output on documents
2017-10-09 10:48:26 +02:00
Laurent Destailleur
3e0ccd6312
FIX #7585
2017-10-09 10:43:19 +02:00
KHELIFA
d77dfb9199
Fix return chariot
2017-10-09 09:26:25 +02:00
Laurent Destailleur
67c33840cf
Code comment
2017-10-08 23:19:19 +02:00
Laurent Destailleur
33624e1001
NEW Attaching doc automatically in email is now a parameter of template.
2017-10-08 16:34:42 +02:00
Laurent Destailleur
7465daa0da
Merge pull request #7583 from hregis/develop_admin
...
NEW add '$moreatt' parameter in picto_from_langcode function
2017-10-07 13:45:16 +02:00
Laurent Destailleur
66978a3bb4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2017-10-07 13:44:27 +02:00
Scrutinizer Auto-Fixer
328d39bc71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
Laurent Destailleur
74deb05527
Clean code. Use constant for status of supplier order process.
2017-10-07 13:04:31 +02:00
Laurent Destailleur
4347bc06a2
do no transform data:image
2017-10-07 02:40:03 +02:00
Laurent Destailleur
3cc48f156f
The new website module become wonderfull
2017-10-07 02:29:27 +02:00
Laurent Destailleur
aa3fd067fc
Fix regex UNGREEDY
2017-10-06 23:54:45 +02:00
Laurent Destailleur
8e187c2759
Debug module website
2017-10-06 22:49:08 +02:00
Regis Houssin
e0e10ff830
NEW add '$moreatt' parameter in picto_from_langcode function
2017-10-06 20:53:41 +02:00
Laurent Destailleur
df38f60617
Export website into zip
2017-10-06 18:29:18 +02:00
Laurent Destailleur
43d85af5ae
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 15:23:10 +02:00
KHELIFA
dc87133e0b
Fix carriage return when get full address formated for output on documents
2017-10-06 15:06:59 +02:00
Laurent Destailleur
1becbb8805
Fix bad date on time spent view
2017-10-06 14:38:33 +02:00
Laurent Destailleur
f9d9642340
FIX #6981
2017-10-06 14:07:28 +02:00
Laurent Destailleur
777486d74c
Keep usage of function dol_hash to encrypt a non encrypted data
2017-10-06 13:13:51 +02:00
Laurent Destailleur
4bc7eb0ec1
Merge pull request #7520 from hregis/develop_ldap
...
Fix: Set LDAP password when LDAP key changed
2017-10-06 13:09:28 +02:00
Laurent Destailleur
06b18a740e
NEW Add date of birth on user card.
...
NEW Show expected worked hours on the timesheet form.
2017-10-06 12:08:01 +02:00
Laurent Destailleur
edacf6789b
Remove dead code
2017-10-06 10:47:58 +02:00
Laurent Destailleur
848aadb48a
FIX Do not lose selected id after ENTER the TAB on autocomplete
2017-10-06 10:47:02 +02:00
Regis Houssin
8a79198769
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ldap
Conflicts:
htdocs/core/class/comment.class.php
2017-10-04 20:00:39 +02:00
Laurent Destailleur
8e0da9bfeb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
Regis Houssin
c563c3d3ac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-10-04 13:19:07 +02:00
Laurent Destailleur
9b3826a54c
Invert left and right (my own comment on left)
2017-10-04 13:17:16 +02:00
Laurent Destailleur
85606126a9
Standardize code for events
2017-10-04 12:58:13 +02:00
Regis Houssin
66ad30feb0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-10-04 11:23:50 +02:00
Laurent Destailleur
75a7e086b3
Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element
...
New comment generic element
2017-10-04 11:13:39 +02:00
Regis Houssin
feea6246c2
NEW add possibility to hide LDAP tab for non admin
2017-10-04 09:13:41 +02:00
Regis Houssin
8d3ad9ddc8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-10-04 08:43:07 +02:00
Laurent Destailleur
436ec93084
FIX is_erasable report bad value when thirdparty was not loaded
2017-10-04 03:22:41 +02:00
Laurent Destailleur
a6cf934973
Add log
2017-10-04 02:46:01 +02:00
Laurent Destailleur
5ddd77c950
Fix We must use dol_escape_htmltag for input field not dol_htmlentities
2017-10-03 18:35:35 +02:00
Laurent Destailleur
c22cd1cfe9
Fix test on entity must always be done using the "IN" instead of "="
2017-10-03 17:41:22 +02:00
Laurent Destailleur
f2e0ff0d30
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
2017-10-03 17:25:01 +02:00
Laurent Destailleur
422a3425a8
Merge pull request #7539 from defrance/patch-28
...
unable to delete salaries
2017-10-03 16:16:49 +02:00
Laurent Destailleur
a501a20487
NEW Search filters in lists are restored when using "back to list"
2017-10-03 16:00:52 +02:00
Laurent Destailleur
c4b3dc40c3
Allow : into file names
2017-10-03 10:54:51 +02:00
Laurent Destailleur
888e5ed2c5
Fix sanitize uploaded filename
2017-10-03 10:54:09 +02:00
Laurent Destailleur
793f1318de
Fix sanitize uploaded filename
2017-10-03 09:35:45 +02:00
Laurent Destailleur
26564cc79c
Allow : into file names
2017-10-02 20:38:15 +02:00
BENKE Charlene
41ba7af9fe
unable to delete salaries
...
compta/salaries/cards ask for a salarie/payement/delete right to delete
2017-10-02 18:49:25 +02:00
Regis Houssin
e65b21a3bf
Fix: change the parameter value of dol_getIdFromCode
2017-10-02 11:59:17 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Laurent Destailleur
7c30b3ca5d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-10-02 01:28:20 +02:00
Laurent Destailleur
f785203c0d
Creating a page from an external url can grab images too.
2017-10-01 18:27:54 +02:00
Laurent Destailleur
3ddd5d3d3a
The default value feature is sensitive to url parameters.
2017-10-01 14:54:17 +02:00
Laurent Destailleur
b7810d95b9
Fix permissions
2017-09-30 20:43:15 +02:00
Regis Houssin
46cc23c568
Fix: $this->pass is empty if DATABASE_PWD_ENCRYPTED is used
2017-09-30 10:41:35 +02:00
atm-ph
7ba2dd8397
Fix the pdf_getlineprogress hook isn't use because hookmanager is null
2017-09-28 15:25:51 +02:00
Rui Strecht
4839d0f84d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-28 09:36:52 +01:00
Laurent Destailleur
537a551bb5
Fix vat visiblity on pdf
2017-09-27 21:58:42 +02:00
Laurent Destailleur
6bdfa99fc2
FIX The backtopage
2017-09-27 20:07:01 +02:00
Laurent Destailleur
fdc1aa2a03
NEW Move contacts of a thirdparty on tab Contacts/Addresses
2017-09-27 19:56:03 +02:00
Laurent Destailleur
8242469e40
FIX The unique index on email templates can work now.
2017-09-27 18:16:28 +02:00
Laurent Destailleur
f1f4a2fb44
Add email template to send SEPA mandate
2017-09-27 17:40:14 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
arnaud
f29ea35dc8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-27 14:56:52 +02:00
Rui Strecht
3ebb18ab16
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-26 16:34:59 +01:00
Laurent Destailleur
d7dd6ed334
Fix undefined var
2017-09-26 16:15:22 +02:00
florian HENRY
6fcfe89565
NEW : lettrage in accountancy
2017-09-26 13:02:29 +02:00
Laurent Destailleur
5482f80c0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-26 10:30:47 +02:00
Laurent Destailleur
59571b1ce1
FIX #7473 Mass update of vat rates and other bugs on localtax
2017-09-26 10:29:44 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Regis Houssin
92ff974c5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-25 06:47:34 +02:00
Laurent Destailleur
4246cf24f3
Perf enhancement: Remove one include of js.
2017-09-24 20:36:27 +02:00
Laurent Destailleur
49e9326a6d
Code comment
2017-09-24 19:50:32 +02:00
Regis Houssin
06ee9f4775
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-24 16:10:55 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Laurent Destailleur
b4e461e7ea
Debug modulebuilder
2017-09-23 18:17:34 +02:00
Laurent Destailleur
bee94b32d9
Debug modulebuilder
2017-09-23 15:12:25 +02:00
Laurent Destailleur
57adc28256
Work on modulebuilder
2017-09-23 01:45:03 +02:00
Laurent Destailleur
96aed9c29d
Work on modulebuilder
2017-09-22 23:38:25 +02:00
Regis Houssin
791c385e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ldap
Conflicts:
htdocs/adherents/card.php
2017-09-22 20:26:22 +02:00
Laurent Destailleur
63ec14e47d
Convert sode to send member info email into new generic email template
...
system.
2017-09-22 20:18:11 +02:00
Laurent Destailleur
6d7db96359
NEW Option "one email per recipient" when using bulk actions emails.
2017-09-22 16:31:05 +02:00
Laurent Destailleur
d4bde2a4ea
Fix date substitution for contracts
2017-09-22 15:12:36 +02:00
Laurent Destailleur
252f038468
Mutualize code of substitutions for emails
2017-09-22 14:34:31 +02:00
Laurent Destailleur
bd45ea5a03
Split page for invoice template into card + list. Add more filters.
2017-09-22 11:28:53 +02:00
Laurent Destailleur
beac7a7439
Work on direct download links
2017-09-20 21:29:27 +02:00
Rui Strecht
9fc8012663
Tiny fix to php doc variables
2017-09-20 14:30:53 +01:00
Rui Strecht
395100ca70
Added missing comments for new function parameters, removed unused parameter $searchlabel
2017-09-20 12:45:18 +01:00
Rui Strecht
42a57aab26
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-20 12:16:09 +01:00
Rui Strecht
f1126b65bf
Updated method to fetch state name, code and id to match method used with country
...
Reverted some previous changes to allow backwards compatibility
Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card
2017-09-20 12:06:35 +01:00
Regis Houssin
1f59e4f7e9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-20 12:47:35 +02:00
Laurent Destailleur
8dfa87fcf6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-19 19:30:28 +02:00
Laurent Destailleur
c38ed54990
Disable old datepicker
2017-09-19 17:31:37 +02:00
Laurent Destailleur
5f7631a95d
NEW Days where user is on vacation use different colors in timesheet.
2017-09-19 17:07:39 +02:00
Laurent Destailleur
2a04d497da
Use a different css into timespent entry page when user is on holiday
2017-09-19 16:40:55 +02:00
Laurent Destailleur
978702d04b
Fix false deprecated warning
2017-09-19 01:41:57 +02:00
Laurent Destailleur
b723d2c2d2
Fix scrutinizer bugs
2017-09-19 01:39:22 +02:00
Rui Strecht
76a2513c76
Added self to contributors list
2017-09-18 17:49:31 +01:00
Rui Strecht
998eea09bd
Added new option MAIN_SHOW_STATE_CODE (on/off; 1/0) to show state code in select fields options and values.
...
Changed option MAIN_SHOW_REGION_IN_STATE to on/off - 1/0 and to mix with the new MAIN_SHOW_STATE_CODE (can show region name and state code)
2017-09-18 16:48:13 +01:00
arnaud
e7bb7a3588
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-18 17:28:03 +02:00
arnaud
9795f48046
NEW comment system working with all objects
2017-09-18 17:27:29 +02:00
Laurent Destailleur
70b11f18b5
FIX #7367
2017-09-18 16:06:58 +02:00
Laurent Destailleur
da6b1e92b2
NEW Add the total in the perday view of the time spent form.
2017-09-18 14:18:34 +02:00
Laurent Destailleur
85d59b32b3
Add timespent entry into HR top menu too
...
Faster update of total of timespent
2017-09-18 13:15:24 +02:00
Regis Houssin
f550e27579
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-18 12:15:01 +02:00
Laurent Destailleur
0355b0d9ed
Merge pull request #7414 from aspangaro/7.0-4
...
Accountancy - Finish moving admin to specific menu & some cleaning
2017-09-18 11:16:36 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
e244ee6715
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-17 21:17:04 +02:00
Laurent Destailleur
2c3428a1bf
Fix css
2017-09-17 20:48:09 +02:00
Laurent Destailleur
a3c555049d
NEW Add supplier proposals into stats of product page.
2017-09-17 18:08:23 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Regis Houssin
bdc425c203
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-16 21:41:55 +02:00
Regis Houssin
87b81fb2fd
NEW add members types ldap group management
2017-09-16 21:41:30 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
695c231e78
Update code comment
2017-09-16 10:26:27 +02:00
Laurent Destailleur
bd7c4fe940
NEW Summary of last events on a card are sorted on decreasing date.
2017-09-16 10:12:44 +02:00
Laurent Destailleur
4e7e6cc658
Fix W3C
2017-09-16 09:15:10 +02:00
Alexandre SPANGARO
c2e1e2491d
Accountancy - Finish moving admin to specific menu & some cleaning
2017-09-16 06:53:29 +02:00
Laurent Destailleur
961d475a9d
More complete substitution system.
...
Add __CONTRACT_NEXT_EXPIRATION_DATE__ and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
2017-09-16 03:45:29 +02:00
Laurent Destailleur
b13dbf1f06
Clean code. Make selection of template working even if public.
2017-09-16 00:49:46 +02:00
Laurent Destailleur
087e22ab94
Fix bad status picto
2017-09-16 00:14:39 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
25c4dba8a0
Merge pull request #7402 from hregis/develop_ldap
...
NEW: Add hook addAdminLdapOptions and doAction in ldap admin page
2017-09-15 15:51:38 +02:00
tysauron
2abb38afdf
Beaucoup beaucoup plus rapide
...
Pour moi passe de 4 secondes a 0,8 (grosse base)
2017-09-15 12:48:57 +02:00
Laurent Destailleur
0ade500535
Better support of text editor when no js available.
2017-09-15 11:19:56 +02:00
Laurent Destailleur
e02c220c08
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/card.php
htdocs/public/members/new.php
2017-09-15 11:02:34 +02:00
Regis Houssin
b9e0879847
NEW: Add hook addAdminLdapOptions and doAction in ldap admin page
...
NEW: complete_head_from_modules() in ldap_prepare_head()
2017-09-15 10:57:22 +02:00
Laurent Destailleur
8f5206accf
NEW The lot of a product uses the link and picto when shown into list.
2017-09-15 10:45:41 +02:00
Laurent Destailleur
f16d88fd53
FIX #7391
2017-09-14 13:17:31 +02:00
Laurent Destailleur
2f80618545
Merge pull request #7390 from atm-arnaud/FIX_task_comment_design
...
Fix task comment design
2017-09-14 12:21:58 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
2d7916f77d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/core/lib/json.lib.php
2017-09-14 11:49:02 +02:00
Laurent Destailleur
fe1ce5b3ac
Fix php 7.2 compatibility
2017-09-14 11:44:47 +02:00
Laurent Destailleur
205989b64b
Fix phpunit
2017-09-14 09:16:57 +02:00
Laurent Destailleur
b3b00f63e4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-13 22:30:43 +02:00
Laurent Destailleur
fed3165b53
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/core/lib/price.lib.php
2017-09-13 21:53:03 +02:00
Laurent Destailleur
6d40f797d2
Fix regression
2017-09-13 21:50:14 +02:00
Laurent Destailleur
eadfbfe2bd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
2017-09-13 20:57:53 +02:00
Laurent Destailleur
f2cd96b9c0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
ChangeLog
htdocs/adherents/class/adherent.class.php
htdocs/core/lib/price.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/supplier_proposal/list.php
2017-09-13 20:55:22 +02:00
Laurent Destailleur
dc38ec5051
Fix regression
2017-09-13 20:48:24 +02:00
Laurent Destailleur
9b22f046f5
FIX multicompany better accuracy in rounding and with revenue stamp.
2017-09-13 19:31:32 +02:00
Laurent Destailleur
a5a08006e9
FIX multicompany better accuracy in rounding and with revenue stamp.
2017-09-13 19:27:21 +02:00
Laurent Destailleur
c44a5ede43
FIX Several problem with the last event box on project/tasks
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2017-09-13 15:16:06 +02:00
Laurent Destailleur
7767ac2aa7
FIX Several problem with the last event box on project/tasks
2017-09-13 15:12:54 +02:00
arnaud
4b6553d360
FIX comment color and create colorIsLight function
2017-09-13 10:43:44 +02:00
Laurent Destailleur
d340ce6380
Fix bugs
2017-09-12 19:59:27 +02:00
Laurent Destailleur
bc15a0f8e0
Fix search criteria list
2017-09-12 14:50:12 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Laurent Destailleur
627dd15b44
Suggested link for online payment use the generic link
2017-09-12 12:18:26 +02:00
Laurent Destailleur
fcf82f1163
Enhancement into setup of member module
2017-09-12 11:17:23 +02:00
Laurent Destailleur
1f56800a50
Merge pull request #7341 from atm-arnaud/NEW_task_discussion
...
New task discussion
2017-09-11 15:20:13 +02:00
Laurent Destailleur
029f1c411f
Merge pull request #7357 from hregis/6.0_medias
...
Fix: some problems with medias in multicompany
2017-09-11 14:13:51 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
214bad26db
Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and
...
timezone > 0
2017-09-11 03:30:10 +02:00
Laurent Destailleur
3e6ac36025
Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and
...
timezone > 0
2017-09-11 02:09:48 +02:00
Laurent Destailleur
cf56da8102
NEW Default filter and sort order can use partial list of query
...
parameters to set the qualified URLs.
2017-09-11 00:02:52 +02:00
Laurent Destailleur
3afc90c88f
Fix missing translation
2017-09-10 22:26:45 +02:00
Laurent Destailleur
9f1e349506
Add hidden option message ONLINE_PAYMENT_MESSAGE_FORMIFVAT
2017-09-10 22:24:26 +02:00
Laurent Destailleur
2ae135baf1
NEW Add view of status of template invoice
2017-09-10 20:47:45 +02:00
Regis Houssin
762b4eb876
Fix: some problems with medias in multicompany
2017-09-09 17:48:04 +02:00
Laurent Destailleur
026f9d8e2a
Can set a dedicated message on payment forms
2017-09-09 10:54:30 +02:00
Laurent Destailleur
c7537732d2
NEW Can set a dedicated message on payment forms
2017-09-09 10:03:09 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
arnaud
fdd758abb4
FIX empty test on conf fortask comment was bad
2017-09-08 09:17:22 +02:00
arnaud
82440fd399
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion
2017-09-07 16:24:34 +02:00
arnaud
8906c95eea
NEW comments system on task
2017-09-07 16:23:51 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
7c2c496823
Fix pagination on account list page
2017-09-06 19:53:28 +02:00
Laurent Destailleur
859d0dfe97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-06 19:24:42 +02:00
Laurent Destailleur
33e2179b65
FIX SQL injection
2017-09-06 18:17:57 +02:00
Laurent Destailleur
d26b2a694d
FIX Security fixes (filter onload js, less verbose error message in
...
download and viewimage, show info to encourage dolibarr_main_prod=1)
2017-09-06 11:39:30 +02:00
Laurent Destailleur
0c066b471d
Debug modulebuilder
2017-09-05 22:33:55 +02:00
Laurent Destailleur
f29a4c1fb1
Make accountancy pages responsive
2017-09-05 20:42:34 +02:00
Laurent Destailleur
f23a681dc0
Clean code
2017-09-05 10:16:08 +02:00
Laurent Destailleur
a0cdf784da
Standardize code
2017-09-05 09:43:22 +02:00
Laurent Destailleur
8de51ede18
Add warning to warn against json emulation
2017-09-04 13:22:21 +02:00
Laurent Destailleur
e6f0e76988
Add option MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH
2017-09-02 15:30:00 +02:00
Laurent Destailleur
a6a5602572
NEW Can set email of thirdparty as unique and/or mandatory
2017-09-02 12:36:53 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Laurent Destailleur
1da71d48cd
Work on export site
2017-09-01 11:10:03 +02:00
Laurent Destailleur
31a74d448c
Work on accounting reports.
2017-08-31 22:38:30 +02:00
Laurent Destailleur
8248bc1c64
Uniformize code of accounting report
2017-08-31 15:44:36 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Juanjo Menent
bfc5f01e1e
NEW Add detail of all tax rates into pdf column tax sale.
...
-Can be hidden by pdf setup page
-For know if localtax is applied into line we have to read totaltax line
2017-08-30 14:36:00 +02:00
Laurent Destailleur
991a33f7b6
Make different vat rates visible
2017-08-29 20:40:51 +02:00
Laurent Destailleur
6c202c5fa1
Fix vat rate to show and not vat amount
2017-08-29 19:55:49 +02:00
Laurent Destailleur
8f34de1036
NEW Can include tag {uuu} into some numbering masks to replace with user
2017-08-29 19:44:35 +02:00
Laurent Destailleur
dabd882056
Use a slash
2017-08-29 17:24:49 +02:00
Laurent Destailleur
e862ba9daf
NEW Add detail of all tax rates into pdf column tax sale.
2017-08-29 17:22:03 +02:00
Laurent Destailleur
eebaff95cf
Fix pb with imagick
2017-08-29 13:41:44 +02:00
Laurent Destailleur
560d975063
Code comment
2017-08-29 12:59:13 +02:00
Laurent Destailleur
9312005318
NEW Move accountancy features into a dedicated menu
2017-08-29 12:43:47 +02:00
Laurent Destailleur
a60cd49fb0
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/CMailFile.class.php
htdocs/filefunc.inc.php
2017-08-28 12:53:02 +02:00
Laurent Destailleur
1b1ce4fdf5
Code comment
2017-08-27 19:40:43 +02:00
Regis Houssin
526ccc870b
Fix: add compatibility with old modules
2017-08-27 13:53:08 +02:00
Regis Houssin
1ce1899a46
Fix: add comment
2017-08-27 13:42:46 +02:00
Regis Houssin
d800d10766
Fix: use resprint instead resarray
2017-08-27 13:19:57 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Laurent Destailleur
4052e15565
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/comm/action/card.php
2017-08-26 21:58:29 +02:00
Laurent Destailleur
03eb870576
Fix sql syntax error
2017-08-26 20:16:12 +02:00
Laurent Destailleur
254d92070f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-26 19:58:01 +02:00
Laurent Destailleur
c64a21f47b
Fix regression in cleaning sql
2017-08-26 19:57:22 +02:00
Laurent Destailleur
b3f77ed9f7
Merge pull request #7276 from atm-john/new_develop_extrafields_facture_rec
...
NEW extrafield on facture_rec
2017-08-26 19:26:09 +02:00
Laurent Destailleur
d9a85e6d3b
FIX Install run_sql function accept -- into sql content.
2017-08-26 19:19:23 +02:00
Laurent Destailleur
ebe84b6ac5
Fix run sql with large data
2017-08-26 16:24:55 +02:00
Laurent Destailleur
f2a437fa89
Enhance modulebuilder
2017-08-26 15:22:13 +02:00
Laurent Destailleur
98f5fbab5d
Fix error on contact/address not linked on thirdparty
2017-08-25 13:50:45 +02:00
Laurent Destailleur
d8ead2693f
Fix field position
2017-08-24 17:59:20 +02:00
John
0653a5d177
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec
2017-08-24 14:35:01 +02:00
Laurent Destailleur
326d3df63f
FIX select of category
...
FIX pb with extrafield list and key '0'
Conflicts:
htdocs/core/class/extrafields.class.php
2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e
FIX select of category
...
FIX pb with extrafield list and key '0'
2017-08-24 13:23:15 +02:00
Regis Houssin
982fca541d
Fix: (Agenda) Allowed if link to third party is empty
2017-08-24 08:33:40 +02:00
Regis Houssin
1befd9c67f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-23 21:05:36 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
f3ef6448d7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
2017-08-23 16:11:51 +02:00
Laurent Destailleur
4da49dfc2d
FIX #7239
2017-08-23 15:02:38 +02:00
Laurent Destailleur
e25a428118
Fix compatibility with Internet Explorer
2017-08-23 12:32:28 +02:00
Laurent Destailleur
aae24c26a3
Some fixes with smartphones
2017-08-22 20:20:34 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Laurent Destailleur
a2b41a30fc
Fix duplicate header in website module
2017-08-22 15:44:28 +02:00
Laurent Destailleur
ec56ff59d6
Fix invalid link after renaming a website key.
2017-08-22 15:32:45 +02:00
John
b18104788e
New extrafield on facture_rec
2017-08-22 15:22:41 +02:00
Laurent Destailleur
14cd150762
NEW Introduce experimental feature to search dolistore from application
2017-08-22 14:47:01 +02:00
Regis Houssin
e86d3d7905
Fix: Travis error "Missing parameter name"
2017-08-22 09:47:33 +02:00
Laurent Destailleur
583fc485a9
Work on website module
2017-08-21 03:13:44 +02:00
Laurent Destailleur
68c31c55c5
FIX delete dir when there is symlinks
2017-08-21 01:26:22 +02:00
Laurent Destailleur
eedf5e0a22
FIX delete dir when there is symlinks
2017-08-21 01:24:34 +02:00
Laurent Destailleur
ac3a270e17
FIX Do not delete files into sym links
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-08-21 00:43:52 +02:00
Laurent Destailleur
b9511fd4c6
FIX Do not delete files into sym links
2017-08-21 00:40:32 +02:00
Laurent Destailleur
5c5c4046a1
Prepare setup for email reminder
2017-08-20 16:07:22 +02:00
Laurent Destailleur
260beed512
NEW Generated files are now indexed in database
2017-08-18 23:19:55 +02:00
Laurent Destailleur
097b660c41
Mutualize code
2017-08-18 16:25:00 +02:00
Laurent Destailleur
4d46b2ae58
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/filefunc.inc.php
2017-08-17 22:21:30 +02:00
Laurent Destailleur
744f0ab198
Merge remote-tracking branch 'origin/5.0' into 6.0
2017-08-17 22:03:26 +02:00
Juanjo Menent
3330f040ba
FIX: Bad tax calculation with expense report
2017-08-16 11:19:28 +02:00
Laurent Destailleur
d37d1a033a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/bank/bankentries.php
htdocs/core/lib/admin.lib.php
htdocs/install/mysql/migration/repair.sql
2017-08-11 19:56:17 +02:00
Laurent Destailleur
975fd0a6d3
Fix font size
2017-08-07 15:43:42 +02:00
Laurent Destailleur
66ffc9ca47
Debug modulebuilder
2017-08-05 11:44:27 +02:00
Laurent Destailleur
180b7d3c11
Debug modulebuilder
2017-08-05 11:35:42 +02:00
Laurent Destailleur
1c157c7c3d
Fix pb with mix collation. Add a way to fix this in repair.
2017-08-04 21:23:40 +02:00
Laurent Destailleur
402e6bf650
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/index.php
htdocs/compta/paiement/list.php
htdocs/core/modules/modCron.class.php
2017-08-04 15:39:00 +02:00
Laurent Destailleur
7c840b8348
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-08-04 15:32:30 +02:00
Laurent Destailleur
a7dda865c9
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-08-04 15:29:54 +02:00
Laurent Destailleur
a3beceade2
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-08-04 15:28:55 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
2a92ee6008
Fix look and feel v6
2017-08-02 14:10:43 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Ferran Marcet
09c271b7c5
Fix: Correction in the calculation of the next week
2017-08-02 10:31:16 +02:00
Laurent Destailleur
71d49f1c6f
Fix pb in ecm
2017-08-01 18:44:34 +02:00
Laurent Destailleur
f9dc628f0b
Add tool to fix missing thumbs
2017-08-01 15:53:22 +02:00
Laurent Destailleur
b6a7ce6822
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-01 10:22:37 +02:00
Laurent Destailleur
7d6d4adcdb
Fix combo for multicompany not visible where there is other hooks by
...
other modules
2017-07-31 18:16:41 +02:00
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
7a69df08c5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/cron/class/cronjob.class.php
2017-07-31 02:39:42 +02:00
Laurent Destailleur
69357dd91c
Merge pull request #7113 from atm-ph/new_develop_expense_report
...
NEW Add expense report rules and ik
2017-07-31 02:33:49 +02:00
Laurent Destailleur
80f096a9d8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-31 02:09:15 +02:00
Laurent Destailleur
bb8d458468
Fix menu editor
2017-07-30 19:41:45 +02:00
Laurent Destailleur
5e17c2efb9
Fix into filters of time consumed
2017-07-28 23:32:55 +02:00
Laurent Destailleur
25c5ed8f72
Fix for compatibility
2017-07-28 18:09:38 +02:00
Laurent Destailleur
b0e62f9d24
Enhance image replacement
2017-07-28 17:17:40 +02:00
Laurent Destailleur
60493d0a47
Several fixes (permission, missing method or class) in REST APIs
2017-07-28 11:03:30 +02:00
atm-ph
1f3f9e40b1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-27 16:01:53 +02:00
Laurent Destailleur
ec27eb5b1e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/societe/list.php
2017-07-27 02:09:40 +02:00
Laurent Destailleur
7e0a165131
Fix some pb in search using phone
2017-07-26 20:33:25 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +02:00
Laurent Destailleur
bd85d87e3e
Fix pb with .svg
2017-07-25 23:02:48 +02:00
Laurent Destailleur
ab72fbffc6
Fix pb with .svg files
2017-07-25 23:02:14 +02:00
Laurent Destailleur
e62a8d7bfa
Debug modulebuilder
2017-07-25 01:22:06 +02:00
Laurent Destailleur
73c7aa378e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 20:30:03 +02:00
Laurent Destailleur
9043cf759b
Fix clone function
2017-07-23 20:27:30 +02:00
Laurent Destailleur
25b107defb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Regis Houssin
2efb86b5d8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-23 10:36:14 +02:00
Laurent Destailleur
854a6ca3d5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-22 16:40:45 +02:00
Laurent Destailleur
44023606c6
Fix pb in dolGetFirstLineOfText. Add PHPunit
2017-07-22 12:47:35 +02:00
Laurent Destailleur
f64a9968a9
Debug modulebuilder
2017-07-22 01:00:43 +02:00
Regis Houssin
26df1389f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Laurent Destailleur
f97ecd0a45
The css files is also parsed with function to clean images
2017-07-21 20:16:53 +02:00
Laurent Destailleur
058e88c6f3
Fix title in html header
2017-07-21 12:26:11 +02:00
Laurent Destailleur
23d9353a3d
Fix title in html header
2017-07-21 12:21:48 +02:00
Laurent Destailleur
302ee97d31
Debug module website
2017-07-21 02:51:56 +02:00
Laurent Destailleur
28254655e9
Debug module website
2017-07-21 02:30:02 +02:00
Laurent Destailleur
3b8f60f90e
Fix pb of recursive include in website module
2017-07-20 16:49:20 +02:00
Regis Houssin
c8bd11660d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-18 15:23:43 +02:00
Laurent Destailleur
4582b54e91
Fix use command standard @... to mark a change in official code
2017-07-17 20:09:19 +02:00
Laurent Destailleur
d832bfc056
Some fix into dol_compress_dir function.
2017-07-17 11:05:38 +02:00
Laurent Destailleur
330f3af74d
Fix pb in recursive dol_dir_list return.
2017-07-17 10:26:36 +02:00
Laurent Destailleur
4d9ae5bb44
Work on modulebuilder
2017-07-16 14:57:30 +02:00
Laurent Destailleur
7b2a71802b
Do some TODO on modulebuilder module.
2017-07-16 13:00:35 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
ab6646d16b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/bank/bankentries.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-07-15 03:54:50 +02:00
Laurent Destailleur
312b153005
Fix phpcs
2017-07-13 23:46:01 +02:00
Laurent Destailleur
7eb4562432
Code comment
2017-07-13 15:22:07 +02:00
Laurent Destailleur
85d9a2f790
Merge pull request #7145 from hregis/6.0_bug2
...
Fix: missing group name with dol_banner_tab
2017-07-13 14:36:17 +02:00
Laurent Destailleur
23fbef3dae
Fix the delete dir functions does not return real nb of deleted files.
2017-07-13 00:26:05 +02:00
Regis Houssin
d63e15f0c6
Fix: missing group name with dol_banner_tab
2017-07-12 15:52:58 +02:00
Laurent Destailleur
33ceb22b8b
Fix error management into modulebuilder
2017-07-12 13:25:18 +02:00
Laurent Destailleur
40b3ae2a15
Debug modulebuilder
2017-07-12 11:52:07 +02:00
Laurent Destailleur
11cc1f04c4
Work on modulebuilder
2017-07-12 01:55:07 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
Laurent Dinclaux
64a5be3e00
Fixes travis error: Arguments with default values must be at the end of the argument list
2017-07-10 14:14:21 +11:00
Laurent Dinclaux
244574f8e6
Fixes functions comments
2017-07-10 13:19:59 +11:00
Laurent Dinclaux
253f7e252d
Fixes local taxes repports by rate
2017-07-10 13:15:14 +11:00
Laurent Destailleur
aa66676b7d
Quick hack to solve missing alias name on doc.
2017-07-09 15:15:23 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
ba3b6b6aa5
Better support of vat with code in expense report
2017-07-08 18:09:45 +02:00
Laurent Destailleur
2ea7f38d38
Fix migration of version that is not a final version
2017-07-08 12:48:17 +02:00
Laurent Destailleur
eff4282cc2
Clean files
2017-07-07 22:19:01 +02:00
Laurent Destailleur
252d8da8fc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
phf
b8865c425f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-05 10:48:01 +02:00
phf
1beec51928
New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE
2017-07-05 10:44:52 +02:00
Laurent Destailleur
9e26e6b0a3
Fix bad value for ref of old contracts
2017-07-03 11:42:17 +02:00
Regis Houssin
3f882cb33a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-03 09:24:05 +02:00
Laurent Destailleur
c56ea50251
Currency symbol for peru is before value
2017-07-02 14:30:24 +02:00
Laurent Destailleur
658fe93d8c
Fix menu editor (data not aligned)
2017-07-01 12:42:49 +02:00
Laurent Destailleur
b308cfef1d
Fix dol_trunc
2017-06-30 18:30:01 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
05318bb4ec
More complete dol_string_nospecial
2017-06-28 19:02:09 +02:00
Laurent Destailleur
1a860c42ee
Look and feel v6
2017-06-27 16:42:11 +02:00
Laurent Destailleur
1fafa4017d
Fix test on currency name
2017-06-27 12:33:29 +02:00
Laurent Destailleur
3b7667292b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-27 11:59:40 +02:00
Laurent Destailleur
08af9bf365
List before
2017-06-27 10:37:00 +02:00
Laurent Destailleur
2be848025f
Fix parameter withcode of currency_name function. Add PHPUnit tests
2017-06-26 10:09:22 +02:00
Laurent Destailleur
4a21457b8a
Fix position of page nb
2017-06-26 09:28:02 +02:00
Laurent Destailleur
63dcdc3a03
Fix API was loading definition of all APIs at each call.
2017-06-25 17:09:08 +02:00
Laurent Destailleur
693b2fe3b4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/tpl/objectline_create.tpl.php
2017-06-23 11:20:29 +02:00
Laurent Destailleur
45004493e0
Fix multicurrency and vat_src_code not propaged on invoice from
...
shipment.
2017-06-23 11:12:17 +02:00
Laurent Destailleur
014cb4b004
Fix navigation on security event list
2017-06-21 12:03:49 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Regis Houssin
2fffd2fa6f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-20 23:26:21 +02:00
Laurent Destailleur
ec9bbe2b52
Help/Need debug of some online instances with the log view
2017-06-20 16:54:37 +02:00
Laurent Destailleur
08a86fa03d
Start #6981
2017-06-20 12:17:13 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
eef5df583e
Fix php 7.2
2017-06-20 00:50:30 +02:00
Laurent Destailleur
287e727e71
Fix detection of relative URL
2017-06-19 13:47:25 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
996ec4926b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/lib/files.lib.php
htdocs/don/card.php
2017-06-18 22:16:34 +02:00
Laurent Destailleur
0ef507ae7f
Fix rename of file to remove .noexe extension.
2017-06-18 21:52:51 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
Regis Houssin
dcc152d4a4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-18 06:52:20 +02:00
Laurent Destailleur
b73228899a
Merge pull request #7024 from defrance/patch-14
...
Introduce weight conversion lb & oz
2017-06-17 17:52:20 +02:00
BENKE Charlene
12cab2dfe0
Once to Ounce
2017-06-17 16:30:03 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +02:00
Laurent Destailleur
7c41c9a3e4
Fix activation of dependency for a dedicated country.
...
BlockedLog depends now on CashDesk only.
2017-06-17 11:43:00 +02:00
Laurent Destailleur
bebe7baa80
Fix images into medias not reabable into send emails
2017-06-17 10:44:08 +02:00
BENKE Charlene
17247c64f0
add WeightUnitonce
2017-06-17 10:26:01 +02:00
Laurent Destailleur
1d91ce90d3
FIX image from medias directory into PDF free text
2017-06-17 00:16:22 +02:00
Laurent Destailleur
b228fe6a2a
Fix auto focus on module page
2017-06-16 16:06:20 +02:00
Regis Houssin
c656856ec2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi
2017-06-16 10:52:43 +02:00
Laurent Destailleur
ac708a8ee9
Debug accounting module with new structure v6
...
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
2017-06-15 23:58:56 +02:00
Regis Houssin
9410466d72
Fix: better check and security
2017-06-15 21:51:31 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
Laurent Destailleur
7939daa225
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/index.php
2017-06-14 10:18:24 +02:00
Laurent Destailleur
70c7bcc85f
Complete css to get value unique
2017-06-13 15:57:30 +02:00
Laurent Destailleur
c8856182a6
Fix look and feel v6
2017-06-13 15:34:18 +02:00
Regis Houssin
773abff80e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-12 21:24:10 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
Laurent Destailleur
2916444f6c
Fix check on module product for external user
2017-06-12 15:30:00 +02:00
Laurent Destailleur
0207f86aa5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-06-12 12:03:26 +02:00
Laurent Destailleur
6d130351a0
Fix css
2017-06-12 11:32:10 +02:00
atm-ph
946e72f269
Fix 6982 missing parameter to get more informations about files
2017-06-11 12:26:51 +02:00
Regis Houssin
6cac4b15d3
Fix: Parameter must be an array or an object that implements Countable
2017-06-11 06:54:40 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
36b18f0300
Save MAIN_VERSION_FIRST_INSTALL that is not erased.
2017-06-10 22:11:12 +02:00
Laurent Destailleur
9c482b9f2a
FIX CVE-2017-7886
2017-06-10 21:37:27 +02:00
Laurent Destailleur
d037515e37
FIX SQL injection on user/index.php parameter search_statut.
...
Conflicts:
htdocs/user/index.php
2017-06-10 20:10:57 +02:00
Laurent Destailleur
b62da4bb7a
Fix a parameter is required to know what we share.
2017-06-10 20:04:24 +02:00
Laurent Destailleur
890ac81e4d
Fix menu entried must be greyed, sub menus not visible fi not allowed on
...
parent.
2017-06-10 19:16:42 +02:00
Laurent Destailleur
87c8659e72
Fix responsive
2017-06-10 00:45:18 +02:00
phf
c1f3a168cd
Fix wrong attribute name for loop
2017-06-09 16:57:20 +02:00
Regis Houssin
0e8f36dc92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-09 14:00:48 +02:00
Laurent Destailleur
1af74b4c42
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
Laurent Destailleur
929946ad47
Fix several problem with hook printFieldListWhere
2017-06-09 10:12:01 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Regis Houssin
c95b5a4567
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-09 08:04:08 +02:00
Laurent Destailleur
a63050bf46
FIX Warnings
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/core/lib/images.lib.php
2017-06-09 00:38:30 +02:00
Laurent Destailleur
75624376a5
FIX Warnings
2017-06-09 00:27:19 +02:00
Regis Houssin
ade915af5f
New: add dictionnary sharing (multicompany)
2017-06-08 16:36:42 +02:00
Regis Houssin
4b98a1aefd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-08 15:05:45 +02:00
Laurent Destailleur
543630e487
Fix missing count of nb of columns into lists
2017-06-08 14:14:06 +02:00
Regis Houssin
1baa620688
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-08 10:33:26 +02:00
Laurent Destailleur
7587a3d592
Merge branch 'develop' into develop_transverse
2017-06-08 10:25:04 +02:00
Regis Houssin
44dba391c1
New: add dictionnary sharing (multicompany)
2017-06-08 10:24:16 +02:00
Regis Houssin
b66da3d148
New: big refactorization of multicompany transverse mode
2017-06-06 10:23:33 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
7f18dfee0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
dev/skeletons/skeleton_card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/projet/card.php
2017-06-03 01:55:05 +02:00
Laurent Destailleur
9e629bdb02
Work on modulebuilder
2017-06-02 20:01:25 +02:00
Laurent Destailleur
c59d216cf5
NEW Can read time spent of others (hierarchy only or all if granted)
2017-06-02 13:24:45 +02:00
Laurent Destailleur
5c58ed8ca7
Add a better error message when payment link is not valid.
2017-06-02 09:13:04 +02:00
Laurent Destailleur
976c8e0752
Fix security to test access on a task
2017-06-01 19:53:54 +02:00
Laurent Destailleur
76e1438fe6
FIX REST api to get project when user has permission to read all.
2017-06-01 17:29:47 +02:00
Laurent Destailleur
f4cdb6b254
Fix month on 2 chars. Some setup return on 1 char only. More phpunit
...
assert.
2017-06-01 15:33:23 +02:00
Laurent Destailleur
7ad92c3a4d
Fix new generic substitution system
2017-06-01 13:32:20 +02:00
Laurent Destailleur
77df19009d
Removed duplicated code
2017-06-01 12:11:45 +02:00
Laurent Destailleur
417f71a8be
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-01 02:01:34 +02:00
Laurent Destailleur
c70beaa56b
Complete work for mutualizing generic substitution system.
2017-06-01 01:57:22 +02:00
Laurent Destailleur
40334dbe14
Merge pull request #6905 from atm-quentin/NEW_project_mask_with_user_extrafield
...
NEW_extrafield_in_project_mask
2017-05-31 19:46:22 +02:00
Laurent Destailleur
a49174313f
Replace {extra_ with {user_extra_
2017-05-31 19:45:54 +02:00
Laurent Destailleur
6c7179d281
Test of commit with autoremove trail space
2017-05-31 19:20:33 +02:00
Laurent Destailleur
d5f83d6bbe
NEW #6915 Simplest change.
2017-05-31 19:15:39 +02:00
Laurent Destailleur
145cb628cd
FIX dol_string_nohtmltag make 2 passes to clean html into html
...
attributes.
2017-05-31 11:11:25 +02:00
Laurent Destailleur
c39ca4cff8
NEW Introduce function dol_compress_dir
2017-05-31 00:20:35 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
fa6bc03765
Fix typo
2017-05-30 01:34:20 +02:00
Laurent Destailleur
d56cd44ebc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-29 19:11:41 +02:00
Quentin Vial-Gouteyron
f563746310
NEW_extrafield_in_project_mask
2017-05-29 15:38:40 +02:00
Laurent Destailleur
c71488e58b
Removed deprecated code
2017-05-29 15:09:13 +02:00
Laurent Destailleur
0c5bf21f3a
Merge pull request #6900 from aspangaro/6.0-d1
...
Review expense report - Look and feel v6
2017-05-29 10:56:57 +02:00
Laurent Destailleur
452579150d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2017-05-29 10:43:26 +02:00
Laurent Destailleur
e667d72547
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
2017-05-29 10:41:51 +02:00
Laurent Destailleur
16456cf19f
Merge pull request #6891 from hregis/develop_api
...
NEW add REST api "memberstypes"
2017-05-29 10:29:04 +02:00
Laurent Destailleur
425192ef84
Merge branch 'develop' into 6.0-multijournal
2017-05-29 10:23:46 +02:00
Laurent Destailleur
70636cc59f
FIX SQL injection on user/index.php parameter search_statut.
2017-05-29 09:59:21 +02:00
Laurent Destailleur
c4f09b8894
Work on modulebuilder
2017-05-28 14:43:17 +02:00
Laurent Destailleur
c651f1da45
Work on modulebuilder tool
2017-05-27 19:05:36 +02:00
Alexandre SPANGARO
570f9aaa9e
Review old payment page for expense report
2017-05-27 08:18:53 +02:00
Regis Houssin
18886849eb
New: add REST api "memberstypes"
2017-05-25 08:54:30 +02:00
Alexandre SPANGARO
ba7e754174
Remove old code (journal)
2017-05-25 05:32:13 +02:00
Laurent Destailleur
e5fe629a0e
NEW Extrafields support formulas to be computed using PHP expressions
2017-05-24 22:48:44 +02:00
Laurent Destailleur
6d4c5e4b4a
Code comment
2017-05-24 11:37:44 +02:00
Laurent Destailleur
67b3e3da99
FIX #6784
2017-05-23 15:51:39 +02:00
Laurent Destailleur
3e37185b74
FIX download attached file on resource
2017-05-23 13:44:18 +02:00
Laurent Destailleur
a3eef35ce6
Fix travis error
2017-05-22 01:19:16 +02:00
Laurent Destailleur
ecce1c2037
Remove conf
2017-05-21 23:58:19 +02:00
Laurent Destailleur
090a7028d7
Fix constant usage
2017-05-21 23:41:04 +02:00
Laurent Destailleur
965e23b711
Test to fix a regression
2017-05-21 19:45:47 +02:00
Laurent Destailleur
5cb38ece19
Fix travis errors
2017-05-21 19:37:15 +02:00
Laurent Destailleur
6aa6ef1f9f
Fix travis error
2017-05-21 18:30:43 +02:00
Laurent Destailleur
52b5a8ece7
More powerfull dol_move function.
2017-05-21 14:06:43 +02:00
Laurent Destailleur
5992175b68
Standardize code between customer and supplier invoice list.
2017-05-21 03:23:44 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
2dd2ab1003
Look and feel v6
2017-05-20 20:59:54 +02:00
Laurent Destailleur
7e25cc0475
FIX Phpunit on file submit with REST API
2017-05-20 17:09:15 +02:00
Laurent Destailleur
80cbc28385
NEW Add REST API to push a file.
2017-05-20 15:52:36 +02:00
Laurent Destailleur
601f3ea75e
Fix dol_check_secure_access_document in write mode, add phpunit tests
2017-05-20 11:31:03 +02:00
Laurent Destailleur
06b37d0e82
Work on dol_check_secure_access_document to support write question
2017-05-19 20:17:33 +02:00
Laurent Destailleur
30cedd154e
Fix default value must apply only if restore_lastsearch_values is on
2017-05-19 15:42:11 +02:00
Laurent Destailleur
4e7353f8a0
Clean code
2017-05-19 13:39:00 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
Laurent Destailleur
ff2a268831
NEW Architecture to manage search criteria persistance (using
...
save_lastsearch_values=1 on exit links and restore_lastsearch_values=1
in entry links)
2017-05-19 00:52:13 +02:00
Laurent Destailleur
92d7b907be
Merge pull request #6844 from defrance/patch-10
...
problems with additionnal template type
2017-05-18 17:48:30 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
5a79d11389
Avoid warning
2017-05-18 13:14:56 +02:00
Laurent Destailleur
4a46480ef5
Fix preview of PDF contract
2017-05-18 12:40:20 +02:00
Laurent Destailleur
a36a9fab2f
Look and feel v6
2017-05-18 12:12:36 +02:00
Laurent Destailleur
58f789659d
Remove one picto loading
2017-05-18 02:53:49 +02:00
Laurent Destailleur
b29f325fcf
Work on search criteria persistence
2017-05-16 23:38:23 +02:00
florian HENRY
3890c67210
fix event thirdparty agenda do not show good owner
2017-05-16 19:08:59 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
cc16bb0bef
Debug default value feature.
2017-05-16 12:22:55 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
BENKE Charlie
8e68aa86ac
problems with additionnal template type
...
If i active my new xml templater, and keep odt, the odt folder is added on folder to scan on my xml path
ex :
odt folder defined : c:\toto
xml folder defined : c:\tata
folder scanned with odt : c:\toto
folder scanned with odt : c:\toto,c:\tata
2017-05-14 15:17:40 +02:00
Laurent Destailleur
54088f38fb
Code standardization on online payment code
2017-05-13 14:03:09 +02:00
Laurent Destailleur
f7e042d7b8
Look and feel v6
2017-05-13 13:02:55 +02:00
Laurent Destailleur
b09300ab61
NEW Can edit background color for odd and even lines in tables
2017-05-11 13:02:29 +02:00
Laurent Destailleur
d3917b6065
FIX Bad return code of dolCpyDir
2017-05-11 12:25:53 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
5a96ae54b9
FIX Link to files on bank account tab broken with multicompany
...
FIX Link to preview on thirdparty broken with multicompany
2017-05-10 19:08:07 +02:00
Laurent Destailleur
0156e99894
Code comment
2017-05-10 13:46:02 +02:00
Laurent Destailleur
fe053c8603
Better escaping of error message.
2017-05-10 12:03:40 +02:00
Laurent Destailleur
8e25155fc9
Better escaping of error message.
2017-05-10 12:02:41 +02:00
Laurent Destailleur
c4722e3694
FIX XSS
2017-05-10 11:48:45 +02:00
Laurent Destailleur
5c33c1773f
FIX XSS
2017-05-10 11:47:34 +02:00
Laurent Destailleur
ecf3b6ab33
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-10 00:51:27 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
2fc64b8e11
Fix XSS
2017-05-10 00:44:54 +02:00
Laurent Destailleur
b8b91db007
Use function top_httphead to include headers in pages.
2017-05-09 21:46:57 +02:00
Laurent Destailleur
667e3c2876
Add another security sanitizing option
2017-05-09 19:26:28 +02:00
Laurent Destailleur
081d0e7ec2
Debug module RH. Edition of user bank account is ok.
2017-05-09 11:09:21 +02:00
Laurent Destailleur
fd6518182b
Fix can force tls version
2017-05-08 12:08:43 +02:00
Laurent Destailleur
910a925167
NEW Add last activation author and ip of modules
2017-05-06 20:43:14 +02:00
Laurent Destailleur
d948447600
Add button to disable all personalized default values in one click.
2017-05-06 17:08:38 +02:00
Laurent Destailleur
44bdf91715
Add badge with nb of imported calendard on user tab
2017-05-06 12:43:45 +02:00
Laurent Destailleur
56140ae572
Work on default focus
2017-05-06 01:09:22 +02:00
Laurent Destailleur
d53654e64f
Look and feel v6
2017-05-05 20:45:06 +02:00
Laurent Destailleur
d7e10085b8
Clean code. Using 2 different key for a param is not more allowed.
2017-05-05 18:42:11 +02:00
Laurent Destailleur
57e540af53
For better compatibility with module for 6.0
2017-05-05 17:46:40 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
2120b9af85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/theme/eldy/style.css.php
2017-05-05 14:14:21 +02:00
Laurent Destailleur
68b63927e0
Maxi miscellaneous debug
2017-05-05 12:33:49 +02:00
Laurent Destailleur
db8c4a5ac4
Merge pull request #6760 from fappels/4.0_fix_download_delivery_doc
...
Fix download delivery and donation document
2017-05-05 09:21:19 +02:00
Laurent Destailleur
f069ef9844
FIX #6767
2017-05-05 09:16:11 +02:00
Laurent Destailleur
089b882033
Merge pull request #6755 from atm-quentin/fix_ajax_autocomplete_clone
...
FIX ajax autocomplete on clone
2017-05-04 21:05:40 +02:00
Laurent Destailleur
39d9a0f979
Support of pdf preview on supplier orders
2017-05-04 19:11:19 +02:00
Laurent Destailleur
88917afa08
Merge pull request #6740 from Hugome/fix-length_accounta
...
FIX: length_accounta return variable name
2017-05-04 12:45:45 +02:00
Laurent Destailleur
c7d736376f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-04 12:41:49 +02:00
Laurent Destailleur
e096974b2c
Merge pull request #6735 from defrance/patch-6
...
NEW Add option SITUATION_DISPLAY_DIFF_ON_PDF to display progress or difference for situation invoices
2017-05-04 12:40:05 +02:00
Laurent Destailleur
f543461e9b
Complete the substitution array with substitution array with all
...
possible keys
2017-05-04 11:21:28 +02:00
Laurent Destailleur
8009370f04
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/contact/document.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/repair.sql
2017-05-04 10:01:11 +02:00
Laurent Destailleur
6e1f825190
Look and feel v6
2017-05-01 13:01:05 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
Laurent Destailleur
a8c775dcbd
Fix compatibility with the removal of "constant".
2017-04-29 18:48:30 +02:00
Laurent Destailleur
50d65e3a9f
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
2017-04-29 17:40:47 +02:00
Laurent Destailleur
afc5ab0242
Fix label
2017-04-29 15:10:24 +02:00
Laurent Destailleur
8ec44615cd
FIX serious bugs in accounting (error management, transactions, bad
...
values set)
2017-04-29 14:54:21 +02:00
Laurent Destailleur
faddcb28ac
FIX serious bugs in accounting (error management, transactions, bad
...
values set)
2017-04-29 14:53:29 +02:00
Laurent Destailleur
2e6d865c7d
NEW Can define default values for create forms.
...
NEW Can define default filters for list pages.
NEW Can define default sort order for list pages.
2017-04-29 00:44:25 +02:00
BENKE Charlie
058b43f342
display the good value on pdf
2017-04-28 16:50:30 +02:00
Laurent Destailleur
defce63a24
Work on management of default values
2017-04-28 14:05:28 +02:00
fappels
18981ab0c9
Fix download donation document
2017-04-28 11:39:33 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Laurent Destailleur
d390acc888
FIX A non admin user can not download files attached to user.
2017-04-27 02:03:59 +02:00
Laurent Destailleur
95788c9699
FIX A non admin user can not download files attached to user.
2017-04-27 00:53:13 +02:00
fappels
c69a1205c0
Fix download delivery document
2017-04-26 19:06:41 +02:00
Quentin Vial-Gouteyron
4ab5674ffb
FIX ajax autocomplete on clone
2017-04-25 15:10:46 +02:00
hugome
54256773c5
FIX: length_accounta return variable name
2017-04-21 10:27:48 +02:00
BENKE Charlie
1792ff2d3b
oups inverted value
2017-04-21 09:41:08 +02:00
BENKE Charlie
b7f1e74f6f
New SITUATION_DISPLAY_DIFF_ON_PDF feature
...
allow to display or
the progress situation percent value
the diférential situation percent value
2017-04-20 10:27:44 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Christian Seiler
e23a44bcdf
Added missing Slashes
...
fixed line where two slashes were missing, that caused an error when creating barcodes.
2017-04-16 11:09:18 +02:00
Juanjo Menent
006ad4cef8
FIX #6718 Bug: Discount amount is not locally formatted in CommonObject View
2017-04-15 20:04:45 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
4490477cfb
Fix scrutinizer warning
2017-04-15 03:14:31 +02:00
Laurent Destailleur
d99de641e8
Fic on vat npr
2017-04-15 03:06:25 +02:00
Laurent Destailleur
1e4dd5d095
Fix bug reported by scrutinizer
2017-04-15 03:05:04 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
6c069e9a1a
Fix label of long status
2017-04-13 15:15:44 +02:00
Laurent Destailleur
3e9ccc186a
NEW Small PDF template for products
2017-04-13 10:26:12 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
Laurent Destailleur
d78f3923ee
Support of preview for pdf with several pages
2017-04-12 12:13:38 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
BENKE Charlie
2af3f010bf
expedition->dir_output is used by livraison
...
not livraison->dir_output who not exist
2017-04-11 11:33:14 +02:00
Laurent Destailleur
e68ad408af
Merge pull request #6687 from defrance/patch-5
...
expedition->dir_output is used by livraison
2017-04-11 11:32:16 +02:00
Laurent Destailleur
e08b92d913
Merge pull request #6665 from defrance/patch-4
...
Add invoice_rec_prepare_head for reccuring invoice
2017-04-11 11:13:12 +02:00
Laurent Destailleur
759315aef5
NEW Mass action delete available on project and tasks
2017-04-11 02:48:16 +02:00
Laurent Destailleur
37939e7cbd
NEW Add key __USERID__ and __ENTITYID__ as key for dynamic filters.
2017-04-11 02:17:47 +02:00
Laurent Destailleur
d15792bdf4
Minor fix
2017-04-11 00:59:47 +02:00
BENKE Charlie
20202871eb
expedition->dir_output is used by livraison
...
not livraison->dir_output who not exist
2017-04-10 15:54:02 +02:00
Laurent Destailleur
f1ae0eb7c6
Default value
2017-04-10 12:51:52 +02:00
Laurent Destailleur
0a47245ba5
NEW Add mass actions (pdf merge and delete) for interventions
2017-04-09 14:31:56 +02:00
Laurent Destailleur
ddd101757e
FIX Bulk pdf merge on supplier proposals
2017-04-09 13:26:26 +02:00
Laurent Destailleur
52c86cb3f5
NEW Bulk actions available on supplier orders
2017-04-09 13:12:25 +02:00
BENKE Charlie
a0a9c8fa0c
Update invoice.lib.php
2017-04-09 11:33:56 +02:00
BENKE Charlie
feebd4252a
add invoice_rec_prepare_head for reccuring invoice
2017-04-09 11:29:54 +02:00
Laurent Destailleur
bb7c164752
Work on page to set/edit default values
2017-04-08 14:18:10 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
Laurent Destailleur
a99a4be9e0
Work on 6.0 look and feel
2017-04-06 22:31:45 +02:00
Laurent Destailleur
e2ea5945dd
Work on look and feel v6
2017-04-06 21:48:28 +02:00
Laurent Destailleur
01d69e4b58
NEW Better reponsive design
2017-04-04 12:55:54 +02:00
Laurent Destailleur
9df4bac202
NEW Bookmarks are into a combo list.
2017-04-04 11:56:19 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
d975e7f442
Work on 6.0 look and feel
2017-04-01 12:46:47 +02:00
Laurent Destailleur
cab944a1a1
Merge pull request #6602 from aspangaro/6.0-multijournal
...
New : [FP17] Accounting multi-journals
2017-03-31 17:45:10 +02:00
Laurent Destailleur
01a74a8d23
Work on 6.0 look and feel
2017-03-31 17:41:20 +02:00
Laurent Destailleur
979bcd3a9b
NEW Can add a background image on login page
2017-03-31 11:40:31 +02:00
Laurent Destailleur
8e70c4a0b7
Work on 6.0 new look and feel
2017-03-30 15:39:50 +02:00
Laurent Destailleur
aca1c1944d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_c_action_trigger.sql
2017-03-30 12:02:27 +02:00
Laurent Destailleur
f01815519a
Fix trigger of automatic events
2017-03-30 11:25:28 +02:00
Laurent Destailleur
54b03a3552
Work on 6.0 new look and feel
2017-03-29 11:03:13 +02:00
Alexandre SPANGARO
06c2f04927
Finish work on multijournal admin part
...
Need harmonization on rights
2017-03-29 06:32:26 +02:00
Laurent Destailleur
e416ea275e
Work on 6.0 look and feel
2017-03-28 21:04:38 +02:00
Laurent Destailleur
b5b0eba470
Several enhancement for 6.0
2017-03-28 12:47:48 +02:00
Alexandre SPANGARO
fc2b9a858b
New : [FP17] Add multijournals in accountancy admin
2017-03-28 06:35:03 +02:00
Laurent Destailleur
e38ad37ce3
FIX #6517 #6525 Autocompletion of thirdparty after n chars not
...
implemented
2017-03-26 05:02:06 +02:00
Laurent Destailleur
df59a595de
Fix link to files
2017-03-25 01:29:19 +01:00
Laurent Destailleur
292bcae592
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-25 00:05:04 +01:00
Laurent Destailleur
278bbf184c
Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input
...
New : Add Various payment submodule linked to the accountancy to replace free input in bank
2017-03-24 22:52:39 +01:00
Laurent Destailleur
df17de9d48
Merge pull request #6543 from laudeco/feature/expenseNoteFusionPdf
...
add 'fusion pdf' in mass action of expense report
2017-03-24 22:50:54 +01:00
Laurent Destailleur
d1a988a0be
Fix document_preview is possible on files with + chars inside.
2017-03-24 17:32:38 +01:00
Laurent Destailleur
38660418b4
Include preview of pdf into dol_banner
2017-03-23 22:27:44 +01:00
Laurent Destailleur
22b4d0c276
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-23 21:23:28 +01:00
Laurent Destailleur
fec3a89aa5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-23 11:38:46 +01:00
Laurent Destailleur
996cb9d3f1
NEW Add function ajax_autoselect
2017-03-23 11:16:30 +01:00
Laurent Destailleur
0a35d17207
CSS enhancement
2017-03-23 10:59:13 +01:00
Laurent Destailleur
8199ac9f89
FIX Can't download delivery receipts (function
...
dol_check_secure_access_document)
2017-03-22 19:49:58 +01:00
Laurent Destailleur
a0fe79a113
Fix duplicate include.
2017-03-21 16:46:12 +01:00
Laurent Destailleur
b5e646daa0
NEW Show by default README.md file found into root dir of ext module.
2017-03-21 16:43:09 +01:00
Laurent Destailleur
a5c11dc840
NEW Add function dolMd2Html
2017-03-21 16:03:13 +01:00
Laurent Destailleur
36630b9404
FIX Picto of project on dol_banner and box
...
Conflicts:
htdocs/core/boxes/box_project.php
2017-03-21 13:43:05 +01:00
Laurent Destailleur
68257283e4
Enhance select list
2017-03-21 13:39:42 +01:00
Laurent Destailleur
0e997c973f
FIX Picto of project on dol_banner and box
2017-03-21 13:13:00 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
47e325cc66
NEW Can set the default value of any field on any create page with
...
option MAIN_DEFAULT_FOR_path-to-file_fieldname
2017-03-20 20:35:24 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Alexandre SPANGARO
36f279837f
Update work
2017-03-19 08:17:32 +01:00
De Coninck Laurent
a05ebb6c65
add 'fusion pdf' in mass action of expense report
...
Add a mass action 'fusion pdf (build doc)' in expense report list
2017-03-18 11:51:45 +01:00
Laurent Destailleur
dba6d99686
Minor look enhancement
2017-03-16 17:02:30 +01:00
Laurent Destailleur
0d6a99b35a
Fix space
2017-03-16 11:01:35 +01:00
Laurent Destailleur
888675016d
NEW Can use dol_fiche_end without showing bottom border.
2017-03-15 11:13:30 +01:00
Laurent Destailleur
d951114c18
Merge branch 'develop' into NEW_odt_others_objects
2017-03-14 10:44:05 +01:00
arnaud
192a825de8
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
2017-03-14 09:25:29 +01:00
Regis Houssin
017d73792c
Fix: add md5 password for OpenLdap
2017-03-13 15:00:44 +01:00
Laurent Destailleur
a40142460d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-13 02:30:00 +01:00
Laurent Destailleur
6aeae12775
Fix medias could not be loaded
2017-03-13 02:28:58 +01:00
Laurent Destailleur
4bf0e31299
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/loan.lang
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-11 02:40:42 +01:00
Laurent Destailleur
106d74184c
CSS change.
...
More information on project list of thirdparty.
2017-03-11 00:43:06 +01:00
Laurent Destailleur
29c66b43a3
Fix responsive
2017-03-11 00:07:14 +01:00
Laurent Destailleur
618c27d63c
Optimize space
2017-03-10 16:26:43 +01:00
Laurent Destailleur
c72e7c1057
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
Laurent Destailleur
e7ad91d5a3
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-10 14:50:23 +01:00
Laurent Destailleur
277fa7dbe1
FIX #6444
2017-03-10 14:08:53 +01:00
Laurent Destailleur
fbbcec2ba3
FIX #6444
2017-03-10 14:04:06 +01:00
Laurent Destailleur
f7b387513f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 13:55:28 +01:00
Laurent Destailleur
e6f294d18d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2017-03-10 13:42:55 +01:00
Laurent Destailleur
1a57d1864a
FIX #6443
2017-03-10 13:39:11 +01:00
Laurent Destailleur
3f69b1fdf5
Revert "Fix remove a line that look useless"
...
This reverts commit 1610926ccd
2017-03-10 13:14:02 +01:00
Laurent Destailleur
1610926ccd
Fix remove a line that look useless
2017-03-10 13:11:12 +01:00
Laurent Destailleur
fbb80b54df
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-10 12:23:09 +01:00
Laurent Destailleur
bf34543085
FIX #6443
2017-03-10 12:19:50 +01:00
arnaud
a796a321cc
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
2017-03-10 12:16:55 +01:00
Laurent Destailleur
fda84995e8
If manage zero is set, we must NOT set length. So we can here make a
...
shortcut to avoid useless code.
2017-03-10 11:50:57 +01:00
Laurent Destailleur
c962daabac
NEW add property to show warnings when activating modules
2017-03-09 15:16:16 +01:00
arnaud
4a7e3fb387
NEW odt usergroup
2017-03-08 11:34:21 +01:00
Laurent Destailleur
184d52525a
PHP code to manage pair/impair is replaced by native CSS.
2017-03-07 22:45:22 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
832c91417a
Fix the default_vat_code was not correctly saved and shown on the
...
product price.
2017-03-04 19:16:09 +01:00
Laurent Destailleur
6ee286f5f7
FIX #6404
2017-03-03 15:11:41 +01:00
Laurent Destailleur
28ad50e059
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
2017-03-03 14:31:35 +01:00
Laurent Destailleur
34e5e5f721
FIX #6460
2017-03-03 14:19:46 +01:00
arnaud
abeba95de9
New USER odt
2017-03-02 15:13:42 +01:00
Laurent Destailleur
8ccc57e70f
Fix compatibility with multicompany
2017-03-02 11:46:31 +01:00
Laurent Destailleur
1562df8f93
Fix responsive design
2017-03-02 01:26:15 +01:00
Laurent Destailleur
3de288ef45
Fix badge not compatible with multicompany
2017-02-28 21:33:18 +01:00
Laurent Destailleur
0f22beb774
Upgrade to ckeditor 4.6.2.
2017-02-28 10:49:58 +01:00
Laurent Destailleur
d12caab69a
The hook getNodeList has been replaced by a normalized 'addreplace' hook
...
getDirList.
2017-02-27 02:04:47 +01:00
Laurent Destailleur
08915d88d0
FIX the dolCopyDir fails if target dir does not exists.
2017-02-25 11:53:50 +01:00
Laurent Destailleur
bf591f5f91
Work on module website
2017-02-24 21:13:40 +01:00
Laurent Destailleur
47ea9b57e8
Fix Remove debug var_dump
2017-02-24 14:41:12 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
e981e719a1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/comm/action/card.php
2017-02-23 02:54:40 +01:00
Laurent Destailleur
a79903a2fc
Fix responsive design
2017-02-23 01:29:35 +01:00
Laurent Destailleur
1e45e64a9a
Files sent from ECM module are also indexed in database.
2017-02-22 20:35:42 +01:00
Laurent Destailleur
b66ba6c57c
Fix warning
2017-02-22 19:48:15 +01:00
Laurent Destailleur
a0fb53d5b1
Merge branch 'develop' into NEW_pdf_supplier_payment
2017-02-22 14:20:47 +01:00
Laurent Destailleur
bb72121179
Fix menu loading
2017-02-22 01:47:22 +01:00
Laurent Destailleur
32678015c9
FIX protection against infinite loop on hierarchy
2017-02-21 23:52:13 +01:00
arnaud
842859c394
FIX travis bis
2017-02-20 10:16:28 +01:00
arnaud
26b8112d4e
FIX travis check
2017-02-20 09:22:57 +01:00
Laurent Destailleur
2dbae7b808
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 17:14:00 +01:00
Laurent Destailleur
fd111cb1c6
NEW tooltip can be on hover or on click with textwithpicto function.
2017-02-17 17:11:14 +01:00
arnaud
4ec664029d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment
2017-02-17 16:40:14 +01:00
arnaud
fc0abe659a
NEW PDF with numbertoword
2017-02-17 16:39:36 +01:00
Laurent Destailleur
49afc83a7f
Merge pull request #6437 from defrance/patch-80
...
"Preview" not translated
2017-02-17 13:28:29 +01:00
Laurent Destailleur
8d03f86f45
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 13:10:46 +01:00
BENKE Charlie
e4ede5aef3
"Preview" not translated
2017-02-17 12:32:06 +01:00
Laurent Destailleur
c61c13d9fd
Merge pull request #6428 from laudeco/fix/enable_module_with_dependencies
...
fix the enabling of a dependency module already ON
2017-02-17 10:47:29 +01:00
De Coninck Laurent
fd6c4fd4d0
fix the enabling of a dependency module already ON
...
If a depency module is already activated and we try to activate the parent, we got an error because the entry is already existing in the database.
2017-02-16 09:26:18 +01:00
arnaud
977c18513d
FIX pdf supplier payment work
2017-02-14 12:00:56 +01:00
Laurent Destailleur
868f2e5473
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/update.php
htdocs/core/lib/functions.lib.php
2017-02-13 01:36:02 +01:00
Laurent Destailleur
0e6ba5df4e
Merge pull request #6410 from aspangaro/5.0-25
...
Fix : Bank account label not shown in dol_banner_tab
2017-02-12 20:42:38 +01:00
Laurent Destailleur
7e3785d446
FIX the dolCopyDir fails if target dir does not exists.
2017-02-11 15:42:57 +01:00
Laurent Destailleur
3fa19f84e3
FIX the dolCopyDir fails if target dir does not exists.
2017-02-11 15:40:25 +01:00
arnaud
4230b075c2
INIT pdf supplier payment
2017-02-10 17:28:00 +01:00
Alexandre SPANGARO
5c9c761911
Fix : Bank account label not shown in dol_banner_tab
2017-02-09 05:58:39 +01:00
Laurent Destailleur
6fef6ac2fb
Optimize code and performance of module variant
2017-02-08 14:07:54 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
...
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
Laurent Destailleur
9220a638b5
NEW Filechecker can include custom dir and report added files.
2017-02-06 15:29:07 +01:00
Laurent Destailleur
bda915c63a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-03 15:34:59 +01:00
Laurent Destailleur
3dea950c24
Merge pull request #6355 from atm-ph/new_alternate_htmlid_select_project
...
New htmlid can be use instead of htmlname for select projects
2017-02-03 11:44:54 +01:00
Laurent Destailleur
76280f8ae2
Fix #6365
2017-02-03 11:42:49 +01:00
atm-ph
ac20a1a874
Fix remove param htmlid in ajax_combobox
2017-02-02 20:47:45 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
13f37b2cb9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:25:49 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
fappels
8e675fa039
Improve lot qty separation
...
Add spaces to lot info separation.
Use implode params according PHP doc.
2017-01-31 12:54:00 +01:00
phf
e73c60b526
New htmlid can be use instead of htmlname for select projects
2017-01-31 12:20:45 +01:00
Laurent Destailleur
d7c2bdba38
Fix: link was useless with a nofollow tag.
2017-01-29 16:42:59 +01:00
Laurent Destailleur
3321d865d7
Merge pull request #6304 from IonAgorria/fix-objelem
...
NEW: Add supplier order/invoice to elementproperties
2017-01-27 00:34:17 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
5362d10c0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/hookmanager.class.php
2017-01-21 21:56:24 +01:00
Laurent Destailleur
3a2d9c8610
Fix for rtl languages
2017-01-21 16:12:25 +01:00
BENKE Charlie
e6697c32c4
Update images.lib.php
...
in fact $dir is not used in the function
Conflicts:
htdocs/core/lib/images.lib.php
2017-01-21 12:56:39 +01:00
Laurent Destailleur
a250ba5f56
Close #6307 #6306
2017-01-20 17:52:52 +01:00
Laurent Destailleur
ac32161711
Fix error in total of tasks
2017-01-20 14:36:56 +01:00
Laurent Destailleur
e66aabea85
Fix error in total of tasks
2017-01-20 14:35:18 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
9bb9d4d36e
Fix position of field and tooltip
2017-01-20 12:08:33 +01:00
Ion
9270b2c54c
Add supplier order/invoice to elementproperties
2017-01-20 10:57:41 +01:00
Laurent Destailleur
4047de82bd
Fix navigation on projects
2017-01-20 10:27:37 +01:00
Laurent Destailleur
3336943ff2
Fix responsive
2017-01-18 15:49:12 +01:00
Laurent Destailleur
bb95f139a8
Fix responsive
2017-01-17 20:04:41 +01:00
Laurent Destailleur
43cb9c30b2
Fix var_dump
2017-01-16 12:21:37 +01:00
Laurent Destailleur
da64d4d398
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 10:58:45 +01:00
Laurent Destailleur
ac80d4057d
Fix several running time errors
2017-01-16 09:30:28 +01:00
Laurent Destailleur
a05132d26e
Fix PHP 7.1 error
2017-01-16 09:05:09 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
0fe844aa00
FIX usage of tag {y} in numbering modules
2017-01-16 00:01:06 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
29f07d3e89
The tutorial to add cron is sometimes false. Quick hack for a solution
...
to hide it.
2017-01-13 16:39:35 +01:00
Laurent Destailleur
4d134a4a4e
Merge pull request #6085 from defrance/patch-49
...
NEW Extend option PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES to change supplier ref display mode in PDF
2017-01-12 11:19:54 +01:00
Laurent Destailleur
76a53dfb7d
FIX Accept spaces around the | criteria
2017-01-08 01:01:34 +01:00
Laurent Destailleur
785b2d46b3
FIX Accept spaces around the | criteria
2017-01-08 01:00:47 +01:00
Laurent Destailleur
2c1477ecea
Revert "FIX Accept spaces around the | criteria"
...
This reverts commit 37d158f159
2017-01-07 21:50:14 +01:00
Laurent Destailleur
163ee094ec
Revert "FIX Accept spaces around the | criteria"
...
This reverts commit df9121d6fa
2017-01-07 21:46:26 +01:00
Laurent Destailleur
37d158f159
FIX Accept spaces around the | criteria
2017-01-07 21:34:12 +01:00
Laurent Destailleur
df9121d6fa
FIX Accept spaces around the | criteria
2017-01-07 21:33:13 +01:00
Laurent Destailleur
e9853f3cd7
Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into
...
Franck-MOREAU-develop
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
htdocs/projet/element.php
2017-01-07 17:45:05 +01:00
Laurent Destailleur
1d291ee0e8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-07 17:07:29 +01:00
Laurent Destailleur
9cfc8d4095
Fix several problems into OAuth2 module.
2017-01-06 19:58:46 +01:00
arnaud
b813144edb
NEW generation ODT
2017-01-06 16:44:09 +01:00
Laurent Destailleur
c27a1c1705
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-03 01:34:46 +01:00
Laurent Destailleur
9694a00179
Fix sort is lost on agenda/event of projects
2017-01-02 12:39:12 +01:00
Laurent Destailleur
2c4e8926f8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-31 17:24:14 +01:00
Laurent Destailleur
f46ce68d08
NEW Can sort thumbs visible on product card
2016-12-31 16:16:20 +01:00
Laurent Destailleur
f1961b0207
Work on sorting/indexing upload files
2016-12-31 03:43:22 +01:00
Marcos García de La Fuente
47a444b2ab
Merge branch 'develop' into prod-attr
2016-12-27 15:54:53 +01:00
Laurent Destailleur
7dd06a1ae6
Fix margin pagination
2016-12-27 02:01:27 +01:00
Laurent Destailleur
82052450a6
Complete work on dol_banner
2016-12-26 18:21:18 +01:00
Laurent Destailleur
b5c815367c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-26 15:44:31 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
Laurent Destailleur
a2133f391f
Complete work on dol_banner
2016-12-23 14:52:25 +01:00
Laurent Destailleur
43942e6ea2
Fix css and fix navigation on resource tab.
2016-12-23 13:04:46 +01:00
Laurent Destailleur
ba7ca3da6e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop6
Conflicts:
htdocs/core/photos_resize.php
htdocs/install/mysql/data/llx_c_action_trigger.sql
2016-12-22 17:57:42 +01:00
Laurent Destailleur
26098082d0
NEW Uploaded files are indexed into database
2016-12-20 22:14:27 +01:00
Laurent Destailleur
ed0ffd6f5a
NEW Uploaded files are indexed into database
2016-12-20 19:42:25 +01:00
aspangaro
098dc08169
Loan : Complete work on dol_banner
2016-12-20 07:29:49 +01:00
Laurent Destailleur
1fdbcf4c0f
Fix missing page to match new reorg of agenda events (done for
...
thirdparty but not complete for contact)
2016-12-19 16:22:41 +01:00
Laurent Destailleur
0eded9a8b7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-19 02:36:10 +01:00
Laurent Destailleur
3f5d67d4d6
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-19 02:35:16 +01:00
Laurent Destailleur
876722733a
Better fix to get localtax
2016-12-19 02:33:54 +01:00
Laurent Destailleur
f762c98a37
Fix html not balanced
2016-12-18 11:27:22 +01:00
Laurent Destailleur
8d9ec4f755
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-18 10:47:45 +01:00
Laurent Destailleur
58a0cb5838
Fix css style
2016-12-18 10:47:24 +01:00
Laurent Destailleur
78bf209119
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-18 02:21:57 +01:00
Laurent Destailleur
9fd48df839
Fix minor bug on subscription pages
2016-12-17 19:21:48 +01:00
Laurent Destailleur
c750ba8b99
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/mysql/data/llx_c_payment_term.sql
htdocs/langs/en_US/bills.lang
htdocs/langs/en_US/mails.lang
2016-12-16 13:56:55 +01:00
Laurent Destailleur
8f3ce46c50
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-15 12:12:36 +01:00
Laurent Destailleur
2c4c48ad6f
Better fix to add server name into email id.
2016-12-15 12:11:39 +01:00
Laurent Destailleur
ecab7cb70e
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/class/product.class.php
2016-12-14 12:29:41 +01:00
Laurent Destailleur
d2e4888bdd
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-14 12:21:33 +01:00
Laurent Destailleur
56b3f2c011
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
...
tracking email.
2016-12-14 10:36:11 +01:00
Laurent Destailleur
530d3503f5
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
...
tracking email.
2016-12-14 10:32:31 +01:00
Laurent Destailleur
e1a5a90f0a
NEW Uploaded files are indexed into database
2016-12-13 00:15:21 +01:00
Laurent Destailleur
e26cb0f238
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-12 13:00:20 +01:00
Laurent Destailleur
871c69ad08
Merge branch 'fix_banks_trans_missing' of
...
https://github.com/tarrsalah/dolibarr into
tarrsalah-fix_banks_trans_missing
Conflicts:
htdocs/core/lib/company.lib.php
2016-12-11 13:21:21 +01:00
tarrsalah
0547c91d75
Fix #6142
...
load "banks" translation when constructing societe tab head in
`societe_prepare_head`.
2016-12-11 13:10:05 +01:00
BENKE Charlie
b645a50742
Add translation tabs
2016-12-10 23:49:09 +01:00
Laurent Destailleur
0f2963d05b
Merge pull request #6123 from atm-maxime/mko_multicurrency_debug
...
Fix multicurrency - Part 1
2016-12-10 23:16:14 +01:00
aspangaro
31fcf9aff9
Fix warehouse presentation
2016-12-10 22:13:06 +01:00
Maxime Kohlhaas
9f045eb996
Missing comments
2016-12-10 22:07:05 +01:00
Maxime Kohlhaas
1f48e0486f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug
2016-12-10 21:50:31 +01:00
Laurent Destailleur
2dda1d7c74
Merge pull request #6116 from simnandez/develop
...
Fix: fails to load image to redim into photo resize
2016-12-10 20:00:52 +01:00
Laurent Destailleur
653eb4d907
Fix project into dol_banner
2016-12-10 20:00:07 +01:00
Maxime Kohlhaas
6474591e25
Allow to enter price in currency
2016-12-10 19:54:16 +01:00
Juanjo Menent
99542de935
Fix: fails to load image to redim into photo resize
2016-12-10 14:47:18 +01:00
florian HENRY
a422819277
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng
2016-12-10 11:49:52 +01:00
florian HENRY
2d2959ffba
Set hidden option back
2016-12-10 11:49:35 +01:00
Laurent Destailleur
bd1d076753
Merge pull request #6096 from aspangaro/5.0-b2
...
VAT payment card - Uniformize presentation
2016-12-10 11:44:38 +01:00
Laurent Destailleur
4bb778c54f
Merge pull request #6095 from aspangaro/5.0-b1
...
Fix presentation on Loan / Expense report / VAT
2016-12-10 11:42:08 +01:00
florian HENRY
3b25bf2ee6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng
2016-12-10 11:37:07 +01:00
florian HENRY
a0e8b509db
Finish Advance target emailing feature (back from hashes since 3.7)
2016-12-09 19:06:59 +01:00
Laurent Destailleur
10c00d37b5
Complete use of dol_banner
2016-12-09 15:59:31 +01:00
Laurent Destailleur
fb45c72cc3
Complete use of dol_banner
2016-12-09 15:03:57 +01:00
aspangaro
b1c007aa75
VAT payment card - Uniformize presentation
2016-12-09 06:59:24 +01:00
aspangaro
302109b3fe
Loan - Move tab Notes after Files tab
2016-12-08 22:32:10 +01:00
Laurent Destailleur
3396dfc7f6
NEW Index upload files into database.
2016-12-08 22:12:45 +01:00
Laurent Destailleur
6b5ce5c699
Merge pull request #6084 from milamberspace/Fix_ICE_Maroc
...
Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files …
2016-12-07 12:00:03 +01:00
Laurent Destailleur
ea3e2e4a95
Merge pull request #6082 from bgenere/develop
...
Fixed 2 issues for custom module development regarding import and dictionnaries list.
2016-12-07 11:34:15 +01:00
Laurent Destailleur
1a842d8366
Fix translation
2016-12-05 13:45:57 +01:00
BENKE Charlie
d86503cb66
additionnal feature on supplier ref display
...
we have like this 3 mode of display supplier ref
2016-12-05 11:09:47 +01:00
BENKE Charlie
7ab7149e64
just little indenting
2016-12-05 11:03:12 +01:00
Milamber
e4006602f3
Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files for Morocco (Maroc)
...
Fix issue in pdf.lib.php to add the Prof ID 5 and 6
Ref: http://www.ice.gov.ma/ICE/
2016-12-05 08:04:34 +00:00
Laurent Destailleur
4b831537e5
Fix several problem in notes management of template invoices.
2016-12-04 21:27:08 +01:00
Laurent Destailleur
788cbf9a01
Complete work on dol_banner on contracts
2016-12-04 13:30:17 +01:00
bgenere
1b23f66299
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-02 18:00:34 +01:00
Laurent Destailleur
317df1cf91
Complete work on use of the new ol_banner_tab.
2016-11-30 20:24:36 +01:00
bgenere
9c62adb811
removed a vardump that was used for debug.
2016-11-30 17:46:53 +01:00
bgenere
751651c4d4
Merge remote-tracking branch 'upstream/develop' into develop
2016-11-30 08:37:57 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
bgenere
2e45a8e8b3
Merge remote-tracking branch 'upstream/develop' into develop
2016-11-29 17:15:00 +01:00
Laurent Destailleur
83972b39ce
Complete work on dol_banner. Fix errors due to missing columns.
2016-11-28 23:58:36 +01:00
gauthier
9a1309256d
Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received
2016-11-28 17:13:09 +01:00
bgenere
093942bcd7
Fixed display issue for custom modules dictionnary not displayed
...
properly when blank exists in dictionnary list for core modules.
2016-11-28 15:37:24 +01:00
Marcos García de La Fuente
cf0ee36150
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-11-27 18:10:01 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
gauthier
c433829d27
NEW : interface
2016-11-25 11:04:42 +01:00
Laurent Destailleur
5acd09b2d5
Fix require_once instead of require.
2016-11-24 17:03:18 +01:00
Laurent Destailleur
b035b1e196
Merge remote-tracking branch 'origin/4.0' into develop
2016-11-20 15:48:24 +01:00
Laurent Destailleur
e3c529d483
FIX javascript error when using on mobile/smartphone
2016-11-20 15:38:48 +01:00
Laurent Destailleur
e6894eda0e
Better responsive
2016-11-20 10:58:28 +01:00
Laurent Destailleur
7ac96da0d4
Several fix in warehouse stock change (rounding, api rest)
2016-11-18 16:34:03 +01:00
Laurent Destailleur
0b3765dd9a
Fix phpcs
2016-11-18 13:17:24 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
Laurent Destailleur
4768017662
Debug of module accountancy
2016-11-16 19:23:32 +01:00
florian HENRY
ff734bb5d9
Fix travis
2016-11-16 09:40:29 +01:00
Laurent Destailleur
2961039b98
Code comment
2016-11-15 13:14:26 +01:00
Laurent Destailleur
62e0d4ec3f
FIX Several problems into shipment management with lot enabled
2016-11-14 14:34:15 +01:00
Laurent Destailleur
ecbe719f23
FIX Several problems into shipment management with lot enabled
2016-11-14 13:40:41 +01:00
Laurent Destailleur
cc70b51ba3
Fix missing warning
2016-11-14 02:25:59 +01:00
Laurent Destailleur
a369514e46
Tooltip help better
2016-11-13 20:43:34 +01:00
Laurent Destailleur
6014345fb7
Fix typo error
2016-11-13 18:28:06 +01:00
Laurent Destailleur
4bcc7dc8a0
CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu
2016-11-12 14:36:52 +01:00
aspangaro
e13e66ce7b
Update works
2016-11-12 07:40:08 +01:00
aspangaro
137561aec9
Merge remote-tracking branch 'Upstream/develop' into 5.0-p35
2016-11-12 06:31:06 +01:00
Laurent Destailleur
b1bd9e4930
Responsive design
2016-11-11 23:17:37 +01:00
Laurent Destailleur
7ccc70e00d
Fix as suggested for #5960
2016-11-11 15:29:48 +01:00
Laurent Destailleur
071ba4fbfd
Fix as suggested for #5960
2016-11-11 15:27:29 +01:00
Laurent Destailleur
cd9f1db229
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
2016-11-11 15:12:30 +01:00
Laurent Destailleur
a605e0b972
Fix phpcs
2016-11-11 15:06:31 +01:00
Laurent Destailleur
fd1c0f404c
Merge pull request #5864 from hregis/4.0_bug
...
Fix: add possibility to change width type to prevent some display issues
2016-11-11 14:55:28 +01:00
Laurent Destailleur
9606f67bdb
Better responsive design
2016-11-10 14:57:50 +01:00
Laurent Destailleur
cc64994f30
Better responsive design
2016-11-10 11:33:25 +01:00
Laurent Destailleur
9bff6f966b
NEW Can add event from the card listing events
2016-11-08 14:08:48 +01:00
Laurent Destailleur
7a94cfc994
NEW Better filtering of automatic/manually inserted events.
2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/document.php
2016-11-08 11:36:31 +01:00
Laurent Destailleur
bb5df3beeb
Fix missing tab
2016-11-07 04:02:16 +01:00
Laurent Destailleur
90881f2fa9
FIX Sanitize title of ajax_dialog
2016-11-07 00:15:58 +01:00
Marcos García de La Fuente
286095f5cd
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-11-06 15:01:40 +01:00
Laurent Destailleur
4681c84e1d
Better responsive
2016-11-06 12:16:10 +01:00
aspangaro
5ed79800e0
Begin to wok on Vat expense report integration in reports
2016-11-05 07:48:42 +01:00
Laurent Destailleur
0fea6f22a9
Change code to reduce need of jmobile
2016-11-05 03:27:56 +01:00
Laurent Destailleur
e59c2bb61c
Debug accounting menu. Can now edit product account if already set.
2016-11-04 16:15:31 +01:00
Laurent Destailleur
a658b7cc3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/card.php
2016-10-31 21:31:57 +01:00
Laurent Destailleur
3882fa0c3d
Fix dol_buildpath with parameter 3. Add phpunit tests
2016-10-31 10:37:58 +01:00
Laurent Destailleur
1382858f75
Fix log
2016-10-30 17:42:34 +01:00
Laurent Destailleur
3fbba59f69
Better management of status of events
2016-10-30 13:12:35 +01:00
Laurent Destailleur
e9edbba093
NEW Usage of vat code seems ok everywhere.
2016-10-29 21:02:08 +02:00
Laurent Destailleur
658e30aa2f
Close #4685
2016-10-29 18:09:57 +02:00
Laurent Destailleur
32b6660f63
Uniformize code
2016-10-29 16:18:39 +02:00
Laurent Destailleur
22d2557a48
Clean page
2016-10-28 18:05:46 +02:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
Laurent Destailleur
fb0f5e3230
Better behaviour on small screen
2016-10-27 01:47:03 +02:00
Laurent Destailleur
7d182c286c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step1.php
htdocs/projet/tasks/time.php
2016-10-26 10:40:03 +02:00
Laurent Destailleur
aad4380689
Uniformise code
2016-10-24 20:52:21 +02:00
Laurent Destailleur
36c2b5afcd
Responsive
2016-10-24 18:43:17 +02:00
Laurent Destailleur
bc2342e9a4
Fix bad link
2016-10-24 17:37:39 +02:00
Laurent Destailleur
3b05d00163
Better responsive design
2016-10-24 12:06:33 +02:00
Laurent Destailleur
9560ec54cc
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/facture/list.php
2016-10-24 02:15:12 +02:00
Laurent Destailleur
acf8874c6a
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
...
Conflicts:
htdocs/core/lib/functions.lib.php
2016-10-24 02:11:49 +02:00
Laurent Destailleur
a6c2758ca2
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
...
Conflicts:
htdocs/core/lib/functions.lib.php
2016-10-24 02:10:17 +02:00
Laurent Destailleur
fdcc858008
Merge branch 'dev_resource_extrafields' of
...
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields
Conflicts:
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-10-24 02:05:34 +02:00
Laurent Destailleur
14e78ef50b
Mutualize code of 2 lists into one page.
2016-10-22 13:52:43 +02:00
Laurent Destailleur
3ca3b7ab78
Fix code comment
2016-10-21 10:36:11 +02:00
florian HENRY
5bf03de3fb
Fix setup page
2016-10-19 22:24:04 +02:00
florian HENRY
54a154fa4f
NEW : Add ressource extrafields
2016-10-19 22:14:51 +02:00
Laurent Destailleur
19532c9965
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
2016-10-18 13:00:46 +02:00
Laurent Destailleur
dada679110
Uniformise code
2016-10-18 12:16:12 +02:00
Juanjo Menent
f28c7bbc6d
Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x
2016-10-18 10:20:09 +02:00
Juanjo Menent
6a944bb6a3
Fix: Bad localtaxes calc for Spain if VAT is 0
2016-10-18 10:11:42 +02:00
Laurent Destailleur
c1bf7c52f4
Add a line of filter in list of events related to thirdparty or projects
2016-10-18 00:02:18 +02:00
Laurent Destailleur
434b3ef643
Uniformize code and look and feel
2016-10-17 17:52:58 +02:00
Laurent Destailleur
46c985d8cc
FIX Hidden option PRODUCT_MAX_VISIBLE_PHOTO
2016-10-17 15:16:21 +02:00
Laurent Destailleur
fe471c43d1
Minor css enhancement
2016-10-16 18:28:09 +02:00
Laurent Destailleur
9175ff80a0
Fix download of files uploaded on donation
2016-10-16 17:25:33 +02:00
Laurent Destailleur
c4929c76f2
Merge pull request #5859 from GPCsolutions/5858
...
Fix module activation errors
2016-10-15 02:20:49 +02:00
Laurent Destailleur
1f6ddb485f
Fix missing module supplier proposal for external users
2016-10-14 18:22:07 +02:00
Laurent Destailleur
79d376ee12
Debug accountancy module
2016-10-14 13:05:01 +02:00
Laurent Destailleur
7c1b74133a
Debug accountancy module
2016-10-13 22:29:49 +02:00
Regis Houssin
6423b23fb3
Fix: use parameter instead constant
2016-10-12 15:36:51 +02:00
Regis Houssin
d848e98759
Fix: add possibility to change width type to prevent some display issues
2016-10-12 15:33:33 +02:00
Raphaël Doursenaud
46af0eed63
Fix module activation errors
...
Closes #5858
2016-10-11 10:24:10 +02:00
Laurent Destailleur
7504af42de
Fix regression in GETPOST when value is an array
2016-10-10 00:56:35 +02:00
Laurent Destailleur
747123621c
Fix better log
2016-10-10 00:53:54 +02:00
Laurent Destailleur
8cb38caca1
Fix regression in getUrl
2016-10-10 00:53:15 +02:00
Laurent Destailleur
0803084cc4
NEW The getURLContent return more information on success and error
2016-10-09 20:13:27 +02:00
Laurent Destailleur
cd9654978b
NEW Filters can accept generic search key like __DAY__, __MONTH__,
...
__YEAR__ replaced with current day, month year before making the search.
2016-10-09 19:49:09 +02:00
Laurent Destailleur
ba52eb870c
Enhancement of Oauth module
2016-10-07 18:43:44 +02:00
Laurent Destailleur
28e4c17730
Debug module accountancy expert
2016-10-06 19:59:33 +02:00
Laurent Destailleur
0cfb0ff7b7
Complete help
2016-10-06 19:03:40 +02:00
Laurent Destailleur
db3e3642b0
NEW Can generate SEPA mandate for each bank account of your customers
2016-10-06 00:14:25 +02:00
Laurent Destailleur
46f2f154c2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-10-04 19:47:45 +02:00
Laurent Destailleur
3599f2c840
Uniformize code for recurring invoices
2016-10-04 12:31:45 +02:00
Laurent Destailleur
45a808e034
NEW Generation of document is available on member card
2016-10-03 00:08:47 +02:00
Laurent Destailleur
9fbe96dd38
Fix name of agenda tab
2016-10-02 21:31:32 +02:00
Laurent Destailleur
f92ca518f7
Uniformize look and feel
2016-10-02 16:38:58 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
521008a698
FIX #5746 chrome php
...
Try a fix. Not sure it solved all problems reported
2016-10-01 17:27:52 +02:00
Laurent Destailleur
91a9cb4178
Fix solution to avoid the .noexe
2016-10-01 14:02:24 +02:00
Laurent Destailleur
20ad359c9b
FIX Warning to grant permission must be visible only if one module add
...
some permissions
2016-09-30 18:26:32 +02:00
Laurent Destailleur
287f9972a8
Merge branch 'new_no_default_rights' of
...
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights
Conflicts:
htdocs/langs/en_US/admin.lang
2016-09-30 13:04:14 +02:00
Laurent Destailleur
2b8255590a
Better error message
2016-09-29 13:55:46 +02:00
Laurent Destailleur
6232e59fd2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-26 14:17:36 +02:00
Laurent Destailleur
e60d2b0ae5
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2016-09-26 14:10:39 +02:00
Laurent Destailleur
100312aac2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/adherents/class/cotisation.class.php
2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da
Uniformize code
2016-09-26 00:10:29 +02:00
Laurent Destailleur
4cccaae831
Fix warning
2016-09-25 16:44:55 +02:00
aspangaro
2dbeeedd14
Move tab menu for subscription in member.lib
...
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
2016-09-24 06:48:40 +02:00
Laurent Destailleur
dc45776d31
FIX Date visible on project overview
2016-09-23 10:32:19 +02:00
Laurent Destailleur
133657a8c7
Uniformize code
2016-09-21 01:25:34 +02:00
Laurent Destailleur
79ddc2458d
Better center of left, center and right part of titles.
2016-09-20 12:51:09 +02:00
Laurent Destailleur
af28a67803
Uniformize look using dol_banner
2016-09-19 10:43:30 +02:00
Laurent Destailleur
77e2037195
NEW Add REST API to read, create and delete agenda events
2016-09-19 02:02:45 +02:00
Laurent Destailleur
c8b8e13014
Work on dol_banner for proposals.
2016-09-18 21:38:20 +02:00
Laurent Destailleur
5ea9fc7467
NEW Support extrafields on product lot.
2016-09-12 17:27:44 +02:00
Laurent Destailleur
cad69c9e90
Fix phpcs
2016-09-11 13:38:15 +02:00
Laurent Destailleur
e90909051e
Merge pull request #5718 from atm-alexis/NEW_filter_type_action_thirdparty_event_tab
...
NEW filter on action type on thirdparty event tab
2016-09-11 13:34:08 +02:00
Laurent Destailleur
f8dbc1aa9f
Theme cleaner
2016-09-10 16:09:01 +02:00
Laurent Destailleur
858291c3a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-09 09:32:51 +02:00
Laurent Destailleur
0debcf745a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cron/card.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
2016-09-09 09:32:14 +02:00
Laurent Destailleur
2b7ef01e42
FIX SEC for HTB23302
2016-09-08 11:09:38 +02:00
Alexis Algoud
74d495c192
NEW filter actiontype on thirdparty tab
2016-09-08 10:26:38 +02:00
phf
d3a7b5453b
New type for GETPOST
2016-09-08 10:25:48 +02:00
Marcos García de La Fuente
05728075d6
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-09-06 21:06:33 +02:00
Laurent Destailleur
898bbd6031
NEW Support extrafields for expense reports
2016-09-06 13:00:32 +02:00
Laurent Destailleur
d24045d831
NEW Editing translation GUI become easier with search translation tool.
2016-09-04 14:45:43 +02:00
Laurent Destailleur
e4539be127
FIX sortfield and sortorder parameters output twice in navigation url.
2016-09-04 13:28:37 +02:00
Laurent Destailleur
cb27b01812
Work on feature to find a translation key
2016-09-03 18:47:04 +02:00
Laurent Destailleur
13746a3c03
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-02 22:37:59 +02:00
Laurent Destailleur
aab3b2837a
FIX #5589
2016-09-02 22:34:37 +02:00
Laurent Destailleur
eee53998ad
Mark function as deprecated #5577
2016-09-02 22:14:15 +02:00
Laurent Destailleur
3e84d227b3
Remove not used function calculate_byte. Use dol_print_size instead.
2016-08-31 19:57:17 +02:00
Laurent Destailleur
07e6c156a3
Fix free to reachable
2016-08-31 19:48:15 +02:00
Juanjo Menent
90c670a89e
Merge pull request #5684 from aspangaro/5.0-p9
...
Uniformize presentation on suppliers invoices
2016-08-31 10:08:57 +02:00
aspangaro
688ac691a9
Uniformize presentation on suppliers invoices
2016-08-31 07:05:23 +02:00
aspangaro
3892f295c7
Uniformize presentation of customer's invoice
2016-08-31 06:27:35 +02:00
Juanjo Menent
612db4f66d
Merge pull request #5673 from aspangaro/5.0-p5
...
Fix: Presentation on member card
2016-08-31 02:09:28 +02:00
Juanjo Menent
8155c09d49
Merge pull request #5671 from aspangaro/5.0-p3
...
Fix: Presentation on financial account
2016-08-31 02:08:33 +02:00
aspangaro
e2a92f304d
Presentation on member card
2016-08-29 22:07:21 +02:00
aspangaro
358bcee3a5
Presentation on financiel account
2016-08-29 21:49:34 +02:00
Laurent Destailleur
d6d474f10d
Clean code for category management.
2016-08-29 21:31:27 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
Laurent Destailleur
0d992b2b99
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/cron/class/cronjob.class.php
htdocs/install/pgsql/functions/functions.sql
2016-08-28 02:17:04 +02:00
Laurent Destailleur
bc8e203019
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-08-28 01:58:43 +02:00
Laurent Destailleur
5d7414dcc3
Solve php regression failing travis
2016-08-28 01:58:11 +02:00
Laurent Destailleur
8f809e403d
Uniformize code
2016-08-24 19:38:34 +02:00
Laurent Destailleur
03c30c487c
Uniformise code
2016-08-22 13:46:38 +02:00
Laurent Destailleur
0839a9fa4f
Code comment
2016-08-20 00:54:49 +02:00
Marcos García de La Fuente
7e0b99d5ab
Little changes to PHPDoc comment block
2016-08-11 15:23:00 +02:00
Laurent Destailleur
3f87b0c225
NEW Show photo of contacts on thirdparty card.
2016-08-06 00:04:24 +02:00
Laurent Destailleur
034b08ce56
NEW Add option "Hide images in Top menu".
2016-08-05 23:40:00 +02:00
Laurent Destailleur
890e6f59c8
NEW Support mass actions for proposals
2016-08-05 13:08:23 +02:00
Laurent Destailleur
e168888c59
NEW Reduce nb of picto on ref into list, merging preview and download
2016-08-05 12:20:11 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
Laurent Destailleur
cc21909909
Fix dol_include_once could not work to get external url of a module
2016-08-02 14:33:46 +02:00
Laurent Destailleur
a353093ae7
NEW Phone formatting for Canada. Add dol_print_phone into phpunit tests
2016-08-01 20:18:31 +02:00
Laurent Destailleur
a35dd9f2d1
Fix bad separation of address
2016-08-01 19:37:17 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
51e941b9b4
Fix for option MAIN_OPTIMIZEFORTEXTBROWSER
2016-07-31 13:07:55 +02:00
Laurent Destailleur
a6147ee73b
Miscellaneous fixes
2016-07-30 14:49:29 +02:00
Laurent Destailleur
74a9bbbf38
FIX private property can't be read when building pdf
2016-07-28 23:51:09 +02:00
Laurent Destailleur
d619a641ce
Fix regression (empty log were output)
2016-07-28 14:11:41 +02:00
Laurent Destailleur
aae2086ada
Move notes on dedicated tabs like other elements.
...
Rename also the note available into translation tab into "other" to
avoid confusion because it was not the same usage.
2016-07-28 13:53:17 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
3d2dc3c66e
NEW Each user can select its landing page.
2016-07-26 21:12:52 +02:00
Laurent Destailleur
b615b52f47
FIX html detection fails if only u tag is present
2016-07-26 16:11:38 +02:00
florian HENRY
419dd3095b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
htdocs/societe/class/societe.class.php
2016-07-26 08:59:40 +02:00
Laurent Destailleur
f0a3a5ce02
NEW Mutualize mass action. So "Send by email" is also avavilable on
...
orders.
2016-07-25 21:50:41 +02:00
Laurent Destailleur
3265b7028d
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-25 19:53:28 +02:00
Marcos García de La Fuente
c082505021
NEW Added product attributes feature
2016-07-24 11:27:52 +02:00
Laurent Destailleur
07d0f457b4
Fix: files generated by mass action could not be loaded
2016-07-23 12:44:28 +02:00
Laurent Destailleur
a37caae098
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-07-20 19:01:55 +02:00
Laurent Destailleur
699f857a5e
NEW Add option PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY to show thirdparty
...
on page to submit time.
2016-07-20 18:02:33 +02:00
All3kcis
f4705873cb
Update functions.lib.php
...
Remove useless verification on $level. Second check "in_array" line 624 is sufficient with strict mode.
Otherwise "Emerg level" is not possible with "empty($level).. LOG_EMERG = 0...
2016-07-19 15:27:03 +02:00
Laurent Destailleur
e2a03d18dd
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-16 19:58:36 +02:00
Laurent Destailleur
553981426e
Several minor fixes in expense reports
2016-07-16 15:21:38 +02:00
Laurent Destailleur
9ba1ca5acb
Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14
...
Conflicts:
htdocs/langs/en_US/companies.lang
2016-07-15 17:05:12 +02:00
Laurent Destailleur
9512bf1ac7
Add phpunit tests for option USE_STRICT_CSV_RULES
2016-07-15 12:30:24 +02:00
Laurent Destailleur
ca5c912432
Merge pull request #5370 from IonAgorria/fix-fetchline
...
NEW: Add getElementProperties entry for proposal line
2016-07-15 10:02:20 +02:00
Laurent Destailleur
8fcd2fd76c
Merge pull request #5436 from atm-alexis/FIX_3.8_bug_4682
...
FIX #4682 dol_time_plus_duree use datetime instead of strtotime
2016-07-14 23:02:38 +02:00
Laurent Destailleur
9bd937a3bc
Merge remote-tracking branch 'origin/3.9' into 4.0
2016-07-14 00:35:59 +02:00
Laurent Destailleur
0ad0755f4d
Merge remote-tracking branch 'origin/3.9' into develop
2016-07-14 00:35:09 +02:00
Laurent Destailleur
10e7fa51fc
Fix missing parameters to provide all information required for
...
substitution hooks
2016-07-13 23:06:41 +02:00
Laurent Destailleur
dc51eb0b75
Fix missing badge
2016-07-13 22:21:18 +02:00
Laurent Destailleur
9c06e07f07
Code comment
2016-07-12 13:03:56 +02:00
Laurent Destailleur
1efedbdade
Fix badge on project tab
2016-07-11 10:37:43 +02:00
Laurent Destailleur
bfb48ecce9
Where is the info tab of project ?
2016-07-09 15:30:42 +02:00
Laurent Destailleur
0e4dcb301c
Fix several bugs into projects
2016-07-09 13:58:46 +02:00
Laurent Destailleur
d8d938e82c
Fix performance problems Enter new time spent duration becoma < 1s
...
instead of 30s with 5000 tasks.
2016-07-08 17:06:12 +02:00
Laurent Destailleur
999341c1a2
Better performance
2016-07-08 12:02:09 +02:00
florian HENRY
1bb28648c4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
build/pad/DoliWamp.pml
build/pad/Dolibarr.pml
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
2016-07-07 09:05:13 +02:00
Laurent Destailleur
0af555126c
Fix PHPCS
2016-07-06 11:23:32 +02:00
florian HENRY
afb924043f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_fix5353
Conflicts:
htdocs/core/modules/mailings/advthirdparties.modules.php
2016-07-04 20:43:14 +02:00
Laurent Destailleur
76d24ac8ca
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-07-02 11:27:13 +02:00
Laurent Destailleur
91d2d573c3
Fix NNE has been replaced with ICS
2016-07-02 11:26:55 +02:00
florian HENRY
32e954c8d8
Merge branch 'develop' of local repository into dev_fix5353
2016-07-01 15:08:15 +02:00
Laurent Destailleur
5713d293e3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-01 03:22:16 +02:00
Laurent Destailleur
625213580c
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2016-07-01 03:17:20 +02:00
Laurent Destailleur
3645bd8f69
Merge pull request #5420 from atm-alexis/FIX_3.8_bug_5170
...
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
2016-07-01 03:06:31 +02:00
Laurent Destailleur
05384b2f88
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/list.php
htdocs/projet/card.php
htdocs/societe/consumption.php
2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/sendings.lib.php
2016-07-01 02:06:30 +02:00
florian HENRY
37ee64ae9b
fix 4672
2016-06-30 17:10:06 +02:00
Alexis Algoud
afeb212520
FIX #4682 dol_time_plus_duree use datetime instead of strtotime
2016-06-30 16:16:27 +02:00
florian HENRY
d431e73ec8
Fix #5353
2016-06-30 15:49:57 +02:00
Alexis Algoud
22bc44620b
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
2016-06-30 14:27:58 +02:00
Laurent Destailleur
933ec6c118
FIX detection of HTML content when only p tag is present.
2016-06-29 13:14:53 +02:00
gauthier
d9035e5308
FIX : receiving link never works
2016-06-28 11:41:23 +02:00
Laurent Destailleur
2767df2e01
FIX Solve problem of sending joinded files of another email when several
...
tabs are opened on form to send emails.
2016-06-24 16:10:52 +02:00
Laurent Destailleur
2e4c6597d8
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2016-06-23 21:05:00 +02:00
Laurent Destailleur
91e13d23fe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-06-23 20:20:16 +02:00
Scrutinizer Auto-Fixer
23620e3133
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-06-23 18:19:43 +00:00
Laurent Destailleur
2223ec15d1
Fix doxygen errors
2016-06-23 20:19:35 +02:00
Frédéric FRANCE
3690d11ca2
Update pdf.lib.php
2016-06-23 10:48:52 +02:00
Laurent Destailleur
4a408e76e7
Fix download of mass generated files.
2016-06-22 21:06:08 +02:00
Laurent Destailleur
8356dd1080
Fix minor
2016-06-20 10:22:08 +02:00
Laurent Destailleur
74f19944b9
Fix rtl language ar_SA
2016-06-20 00:13:30 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
Laurent Destailleur
eac5cbb0dd
FIX Fix the reposition on the clear target button.
2016-06-19 11:59:55 +02:00
Laurent Destailleur
4382f2a437
Clean language files
2016-06-18 11:06:11 +02:00
Ion Agorria
5a68001ee6
Add getElementProperties entry for proposal line
2016-06-18 03:28:18 +02:00
Laurent Destailleur
988ed3947c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-06-17 16:28:28 +02:00
Laurent Destailleur
243a30e5de
Code comment
2016-06-17 15:51:09 +02:00
Alexis Algoud
25fe110a34
FIX a task without project inclusion call a non included object Link
2016-06-16 14:08:14 +02:00
Laurent Destailleur
232f525f29
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2016-06-15 18:31:43 +02:00
Laurent Destailleur
65cbf1623b
Fix option testmenuhider. Constant to test it is MAIN_TESTMENUHIDER
2016-06-12 20:24:05 +02:00
Laurent Destailleur
74e59a1bc4
Debug prototype feature "testmenuhider"
2016-06-10 18:41:10 +02:00
Laurent Destailleur
9019576394
Fix css class opacitymedium was not used everywhere.
2016-06-07 15:58:02 +02:00
Laurent Destailleur
dcc1589d7c
Merge pull request #5312 from aspangaro/4.0-p32
...
Loan - Debug & update
2016-06-07 00:28:20 +02:00
Laurent Destailleur
645412517d
css enhancement
2016-06-06 22:07:35 +02:00
aspangaro
a6a96c710d
Restore note page
2016-06-06 20:36:04 +02:00
Laurent Destailleur
9b6e5196ea
Debug module resource. Filter on agenda.
2016-06-06 13:05:36 +02:00
Laurent Destailleur
681249de8a
Debug module resource
2016-06-06 12:29:15 +02:00
Laurent Destailleur
51ce4804dd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-06-06 10:58:43 +02:00
Laurent Destailleur
ff23c825ae
Code comment
2016-06-06 10:58:23 +02:00
aspangaro
fda07997d2
Fix: Loan - Remove page note, already present in card
2016-06-05 15:25:21 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Maxime Kohlhaas
0ab4827091
FIX #5087
2016-06-05 02:06:32 +02:00
Laurent Destailleur
c09dbe05b3
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Laurent Destailleur
db2269b9dd
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:12:34 +02:00
Maxime Kohlhaas
7866fb9dae
Fix #5153
2016-06-04 19:11:32 +02:00
phf
a62f5bd5b4
Fix #2777
2016-06-04 17:17:22 +02:00
jean
49d0c8d5ff
FIX #4173 Ergonomie of product/service card
...
Add configuration key PRODUCT_NODISPLAYIFNOPHOTO to avoid displaying
nophoto.png
2016-06-04 16:34:26 +02:00
Maxime Kohlhaas
3718121cee
Add number of permission in user permission tab
2016-06-04 13:25:56 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
Laurent Destailleur
bf5fbd3a80
FIX Infinite loop on menu tree output for edition
...
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
2016-06-01 21:14:28 +02:00
Laurent Destailleur
028ff5e84c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
htdocs/langs/en_US/products.lang
htdocs/societe/list.php
2016-06-01 17:59:50 +02:00
Laurent Destailleur
ee420b79b1
FIX Infinite loop on menu tree output for edition
...
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
2016-06-01 17:52:06 +02:00
Laurent Destailleur
7519c4a602
FIX Log of tax
...
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
2016-06-01 13:24:27 +02:00
Laurent Destailleur
1bc6c4ffa3
Clean code
2016-05-30 20:50:49 +02:00
Laurent Destailleur
46a0f3dab0
Fix minor bugs
2016-05-30 01:30:28 +02:00
Laurent Destailleur
889ff16906
FIX #5239
2016-05-29 11:56:19 +02:00
Laurent Destailleur
5fd64c81a6
Missing translation
2016-05-21 12:21:17 +02:00
Laurent Destailleur
a66901d7d5
Enhance css
2016-05-21 12:09:54 +02:00
Laurent Destailleur
7087b650d0
More precise parameter parameter targetwithdetails
2016-05-19 17:37:06 +02:00
Laurent Destailleur
9c3b9a8494
NEW: Link on user in leave context reach to leave tab.
2016-05-19 13:25:16 +02:00
Laurent Destailleur
901c7c9517
Link "Backtolist" was missing on products
2016-05-17 02:16:28 +02:00
Laurent Destailleur
55e904bc01
Debug for expert accounting module
2016-05-12 20:45:05 +02:00
Laurent Destailleur
25dfa0c5b9
Work on website
2016-05-07 16:38:32 +02:00
Laurent Destailleur
5a75f346ff
Debug advanced selector
2016-05-06 00:02:22 +02:00
Laurent Destailleur
aa55cdadac
Merge pull request #4944 from FHenry/develop_advtargetemailiing
...
NEW : Advance target emailing
2016-05-05 23:18:27 +02:00
Laurent Destailleur
0c6aaaaa3c
FIX #5168
2016-05-05 23:05:17 +02:00
Laurent Destailleur
d50e9cde34
Merge pull request #5090 from atm-maxime/fix_pdffoot_details
...
PDF foot details
2016-05-05 21:09:46 +02:00
Laurent Destailleur
cbbafb6432
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-05-04 13:50:17 +02:00
Laurent Destailleur
878ba07fcd
NEW The note on time spent can be entered when using the view per day.
2016-05-04 12:24:15 +02:00
Florian HENRY
3d57e83094
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-05-02 20:40:42 +02:00
Laurent Destailleur
df4afdd663
NEW Can disable a module by renaming dir of module into module.disabled
...
(this save time for maintenance when working with FTP).
2016-05-02 09:49:58 +02:00
abb
23c0a0a64e
conflict solved Merge branch 'develop' into abb-14
...
Conflicts:
htdocs/langs/en_US/companies.lang
2016-05-02 01:28:46 +01:00
Laurent Destailleur
f59f3032c6
NEW: Rename path for generic medias files into '/medias' instead of
...
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
2016-05-01 16:34:50 +02:00
Laurent Destailleur
5d1dbdb82c
Merge pull request #5089 from atm-maxime/fix_slect_ziptown
...
Fix country and state were not properly updated after ziptown selection
2016-04-29 19:26:40 +02:00
Laurent Destailleur
19162fc8d5
Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into
...
PeartreeG-patch-1
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/resource/element_resource.php
2016-04-29 18:31:11 +02:00
Laurent Destailleur
8fe799f424
Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr
...
into aternatik-dol_resource
Conflicts:
dev/initdata/img/printcompany.png
htdocs/compta/bank/card.php
2016-04-29 17:51:11 +02:00
Juanjo Menent
5ca989c836
Merge pull request #5126 from FHenry/dev_fixpgsql
...
FIX Postgres migration from 3.9 to 4.0
2016-04-29 12:18:49 +02:00
Laurent Destailleur
2ea5bf3d5e
FIX: Pre selected value was not used on supplier list ouput
2016-04-28 20:04:48 +02:00
Florian HENRY
e698c410f5
FIX Postgres migration from 3.9 to 4.0
2016-04-28 13:56:17 +02:00
Maxime Kohlhaas
0358db0065
Fix use of details in pdf foot
2016-04-23 17:10:56 +02:00
Laurent Destailleur
00a658143d
NEW List of user in agenda view per user show photo thumb
2016-04-23 16:51:22 +02:00
Maxime Kohlhaas
179022b129
Fix country and state were not properly updated after ziptown selection
2016-04-23 16:49:43 +02:00
Laurent Destailleur
b639849a47
Page for proposals must be called card.php (one of last architecture
...
change before the freeze)
2016-04-23 15:37:22 +02:00
Laurent Destailleur
5bfc65676c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/theme/eldy/style.css.php
2016-04-22 21:02:20 +02:00
Laurent Destailleur
63d04f4f2d
Merge pull request #5066 from atm-maxime/fix_thirdparty_instead_client
...
Fix order creation bug because of ->client
2016-04-22 19:20:48 +02:00
Laurent Destailleur
bfc5be1aad
FIX Fix and move dolGetFirstLine function into main
...
FIX Hang on ->client not defined
2016-04-22 19:07:32 +02:00
Laurent Destailleur
2cc24db6a2
Fix typo
2016-04-22 13:45:54 +02:00
Laurent Destailleur
c939273fd5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-22 13:38:56 +02:00
Laurent Destailleur
366db31a9e
Make css more simple
2016-04-22 13:38:44 +02:00
Laurent Destailleur
7515b2ba7b
NEW Add a parameter on graph function to show a generic graph when no
...
data are available.
2016-04-22 12:11:57 +02:00
Maxime Kohlhaas
e881701968
Fix pdf generation with thirdparty
2016-04-22 09:46:47 +02:00
Laurent Destailleur
dd443fe7f5
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/localtax/quadri_detail.php
2016-04-21 02:42:43 +02:00
Laurent Destailleur
1e5ff7388c
Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client
...
NEW Removed deprecated CommonObject::client property
2016-04-21 01:49:12 +02:00
Laurent Destailleur
d40e659b30
Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring
...
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-04-19 19:11:54 +02:00
aspangaro
b59c94e056
NEW: Accountancy - Add Result page
...
& review
2016-04-17 15:44:04 +02:00
Marcos García de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Marcos García de La Fuente
54dd1763fe
Little refactor
2016-04-17 15:05:54 +02:00
Juanjo Menent
9f4ccfab95
FIX #3815 With higher quality
2016-04-15 15:54:51 +02:00
Juanjo Menent
c5ecc46a22
FIX #3815 With higher quality
2016-04-15 15:42:58 +02:00
Juanjo Menent
4446e6a36c
FIX #3815 Call to undefined function local_by_date(). branch 3.8
2016-04-15 12:47:21 +02:00
Juanjo Menent
2d3b2c08b5
FIX #3815 Call to undefined function local_by_date(). branch 3.7
2016-04-15 10:56:03 +02:00
Marcos García de La Fuente
a41a80b8fe
Merge branch 'develop' into oop-refactor-bankaccount-tostring
2016-04-09 23:17:09 +02:00
Laurent Destailleur
63dd6d98ec
Remove warnings
2016-04-09 19:53:16 +02:00
Laurent Destailleur
af4a975be2
Fix PHPCS
2016-04-09 19:50:13 +02:00
Laurent Destailleur
acf546d982
Move a not used function into a better place.
2016-04-09 19:42:34 +02:00
Scrutinizer Auto-Fixer
051ccf30a1
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 17:32:05 +00:00
Laurent Destailleur
27217ccccd
Maxi debug of supplier order workflow.
...
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
2016-04-09 18:51:09 +02:00
Laurent Destailleur
475c11ca8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-09 15:08:29 +02:00
Laurent Destailleur
724610ba5b
Quality fixes reported by scrutinizer
2016-04-09 15:07:55 +02:00
Scrutinizer Auto-Fixer
c2243909e9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 13:07:33 +00:00
Laurent Destailleur
5b55af4d66
NEW Mutualize code: Use one call of function "addThumbs", when possible,
...
to generate thumbs files instead of several call of "vignette" function.
2016-04-09 14:12:21 +02:00
Laurent Destailleur
b9ffc18c27
Uniformize log of supplier order. Now use the generic log feature.
2016-04-08 17:28:48 +02:00
Laurent Destailleur
1b04eabf1f
Merge log with events tabs
2016-04-08 14:28:49 +02:00
Laurent Destailleur
b1c2198154
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Laurent Destailleur
059466030a
FIX Missing a new line into log of sent emails
2016-04-07 12:42:18 +02:00
Laurent Destailleur
2c829e7cb6
NEW Add picto on module list to show warning and if module is an
...
external module.
2016-04-07 11:50:45 +02:00
Florian HENRY
344a87f970
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/class/html.formaccounting.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-04-04 14:43:17 +02:00
Marcos García
fded7d3e9a
Corrected PHP documentation of calcul_price_total function
2016-04-03 22:17:25 +02:00
Juanjo Menent
2388887e99
Merge pull request #4938 from aspangaro/4.0-p15
...
FIX: Accountancy - Update balance to add description of the accounting account + bugfix
2016-04-03 17:38:02 +02:00
aspangaro
f8bc456807
FIX: Accountancy - Update balance to add description of the accounting account + bugfix
2016-04-03 15:32:46 +02:00
Juanjo Menent
cd6c6f64c5
Merge remote-tracking branch 'upstream/develop' into dolibarr-3510
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-04-03 12:41:14 +02:00
Juanjo Menent
d55d12baeb
NEW #3510 : Working
2016-04-03 11:56:31 +02:00
Florian HENRY
0ab40f11be
Merge branch 'develop' into develop_advtargetemailiing
2016-04-03 11:29:17 +02:00
aspangaro
33e8833287
Fix travis
2016-04-03 10:47:21 +02:00
Laurent Destailleur
10f639507f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 15:54:51 +02:00
Laurent Destailleur
066c793de2
FIX image extension must be in lower case
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 15:46:01 +02:00
Laurent Destailleur
c12541f4f2
FIX image extension must be in lower case
2016-04-02 15:00:58 +02:00
Laurent Destailleur
c0b2d7405a
FIX Generated thumbs must always use the png format so using thumbs can
...
work.
2016-04-02 14:46:04 +02:00
Laurent Destailleur
599b225489
FIX Creation of thumb image for size "small" was not done.
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 14:21:50 +02:00
Laurent Destailleur
be8384389f
FIX Creation of thumb image for size "small" was not done.
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 14:20:21 +02:00
Laurent Destailleur
66f9f0d046
FIX Creation of thumb image for size "small" was not done.
2016-04-02 14:15:38 +02:00
Laurent Destailleur
281b06a2d3
NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and
...
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
2016-04-01 18:44:23 +02:00
Florian HENRY
ae51321040
Debug Advance target emailing
2016-04-01 14:30:02 +02:00
Florian HENRY
304aab957b
Start implement advance arget emalaing
2016-04-01 10:52:19 +02:00
Laurent Destailleur
2e5cc98e59
Fix into badges visibility
2016-03-29 20:06:01 +02:00
Laurent Destailleur
30aea901b8
Merge pull request #4855 from marcosgdf/account-oop
...
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
2016-03-25 17:41:39 +01:00
Laurent Destailleur
c8fd12cdaa
Update code comment
2016-03-25 17:14:20 +01:00
Laurent Destailleur
61bc8fc9ef
NEW Can edit value date of a vat payment after recording it.
...
Conflicts:
htdocs/compta/localtax/card.php
htdocs/core/class/html.form.class.php
2016-03-25 16:01:45 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Laurent Destailleur
4ec41bc33b
NEW Can edit value date of a vat payment after recording it.
2016-03-25 14:49:48 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Juanjo Menent
c323948669
Merge pull request #4856 from marcosgdf/pdf-phpdoc-fix
...
Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters
2016-03-21 20:40:07 +01:00
Juanjo Menent
187a04854f
Merge pull request #4862 from marcosgdf/form-selectarray2
...
Corrected non-static usages of several Form functions
2016-03-21 20:21:29 +01:00
Laurent Destailleur
d4f5076a84
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-20 17:37:50 +01:00
Laurent Destailleur
706a7f05b8
FIX PHPCS
2016-03-20 17:37:27 +01:00
Laurent Destailleur
6b821f15d1
FIX Bad vat definition when using POS module
2016-03-20 17:36:13 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Marcos García de La Fuente
889c72611d
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-03-19 23:00:33 +01:00
Laurent Destailleur
8689240b7f
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-19 21:37:08 +01:00
Laurent Destailleur
af3256f84a
Fix first change to fix serious pb with vat definition when using the
...
POS.
2016-03-19 21:35:03 +01:00
Marcos García de La Fuente
7fbf16a202
Fixed an error including FormBank class
2016-03-19 20:51:43 +01:00
Marcos García de La Fuente
8ef122ad99
Fixed missing require bug
2016-03-19 20:12:41 +01:00
Marcos García de La Fuente
39d17c0132
Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters
2016-03-19 20:05:13 +01:00
Marcos García de La Fuente
1be9c53b6c
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
2016-03-19 19:39:18 +01:00
Laurent Destailleur
5eef373ed6
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/user/card.php
2016-03-18 14:56:44 +01:00
Laurent Destailleur
97b630ac65
NEW Can use ^ and $ (to say start with or end with like regex syntax)
...
into search fields when search field is text. Bonus: ^$ can filter all
lines with field not defined.
2016-03-18 12:42:13 +01:00
Laurent Destailleur
5edeeae384
FIX Bad error and style message when changing its own login
2016-03-18 11:30:15 +01:00
abb
b6e39960b4
new:handle user notification in notification module
...
Conflicts:
htdocs/core/lib/usergroups.lib.php
2016-03-13 20:08:27 +01:00
Laurent Destailleur
a5571b1040
NEW Show a badge with number of withdraw requests done on the withdraw
...
tab of invoice.
2016-03-13 01:20:54 +01:00
Laurent Destailleur
7dac7c4f04
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-11 11:00:53 +01:00
Laurent Destailleur
a9058df753
Fix bad field in select
2016-03-11 10:47:17 +01:00
Laurent Destailleur
7a5353efb2
Make things clearer about option MAIN_ENABLE_LOG_TO_HTML
2016-03-10 18:36:09 +01:00
Laurent Destailleur
155fd71f6d
Merge pull request #4734 from fappels/develop
...
Fix: add require to showDimensionInBestUnit
2016-03-10 13:22:58 +01:00
Laurent Destailleur
d0441fa05f
NEW: Show into badge on tab head the number of dedicated contacts for
...
objects.
2016-03-10 11:16:12 +01:00
Laurent Destailleur
8ab343e95f
Can choose number of decimals into function showDimensionInBestUnit
2016-03-09 23:17:46 +01:00
Laurent Destailleur
09a29322c3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
htdocs/commande/orderstoinvoice.php
htdocs/public/demo/index.php
htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
Laurent Destailleur
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +01:00
Francis Appels
0890f20a72
Update functions.lib.php
...
Add product.lib for function measuring_units_string
2016-03-04 19:29:08 +01:00
Laurent Destailleur
87093c79f9
Merge pull request #4708 from marcosgdf/account-constants
...
Started using Account TYPE and STATUS constants
2016-03-04 16:23:50 +01:00
Laurent Destailleur
e92318bc13
Better fix to manage several level of beta and rc
2016-03-04 15:21:26 +01:00
Laurent Destailleur
84d2078919
Merge pull request #4710 from hregis/3.9_bug
...
Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2)
2016-03-04 15:18:59 +01:00
Laurent Destailleur
fd2166ed11
Minor enhancement on new recurring invoice generation
2016-03-03 10:42:49 +01:00
Laurent Destailleur
b1c1de422f
Enhance look of cron job list
2016-03-03 10:05:40 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/admin.lib.php
2016-03-02 23:07:42 +01:00
Regis Houssin
057188e1de
Fix: comment debug lines
2016-03-02 11:26:43 +01:00
Regis Houssin
e9ac41fb24
Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2)
2016-03-02 11:23:57 +01:00
Marcos García de La Fuente
ff83dd9afe
Replaced account type comparisons with TYPE constants
2016-03-02 11:08:57 +01:00
Frédéric FRANCE
a58dda76ed
Update product.lib.php
2016-03-01 17:28:08 +01:00
Laurent Destailleur
be9a144433
FIX Add a test to show bugged module with a bad declaration of
...
dictionaries to avoid to see clean module to be breaked.
2016-02-28 12:43:00 +01:00
Laurent Destailleur
2ee74a80d9
NEW Enhance navigation of project module
2016-02-28 00:01:50 +01:00
aspangaro
1bf188db86
Fix: Double line
2016-02-27 14:34:32 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
Laurent Destailleur
23f45c7b7e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/commande/list.php
htdocs/core/lib/pdf.lib.php
2016-02-26 15:45:25 +01:00
Laurent Destailleur
4250fe155a
Fix showing ref of shipment on orders (lines too long)
2016-02-26 15:42:07 +01:00
Laurent Destailleur
c1ea597cb7
Redesign page with customer price to make it easier to understand.
2016-02-26 13:44:03 +01:00
Laurent Destailleur
e115ac90ec
Code comment
2016-02-26 12:08:04 +01:00
Laurent Destailleur
f330a1c8e5
Fix phpcs
2016-02-26 10:55:47 +01:00
Laurent Destailleur
b072b5a181
Fix remove some warnings
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2016-02-26 10:45:25 +01:00
Laurent Destailleur
61edda61e1
Fix remove some warnings
2016-02-26 10:38:42 +01:00
Laurent Destailleur
4b4de22a54
NEW Add hook pdf_build_address
...
NEW Add option MAIN_PUBLIC_NOTE_IN_ADDRESS
2016-02-25 20:54:37 +01:00
Laurent Destailleur
54034ea852
NEW Add $object in parameter of pdf_build_address so we could include
...
hook into the function.
2016-02-25 18:30:31 +01:00
Laurent Destailleur
cdcad62967
FIX Array of linked elements for PDF contains duplicates and missing
...
data
2016-02-25 18:19:20 +01:00
Laurent Destailleur
7fc58ddabc
FIX Array of linked elements for PDF contains duplicates and missing
...
data
2016-02-25 18:18:00 +01:00
Laurent Destailleur
a95240e33d
FIX Some troubles into weight and volume calculation when unit differs.
...
NEW Introduce a function showDimensionInBestUnit
2016-02-25 13:46:38 +01:00
Laurent Destailleur
a5c3658f53
Fix bad formatting of order / shipment ref on PDF
2016-02-25 02:45:27 +01:00
Laurent Destailleur
f1ba81ec66
Fix bad formatting of order / shipment ref on PDF
2016-02-25 02:44:34 +01:00
Laurent Destailleur
1ba2407da4
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-25 01:42:03 +01:00
Laurent Destailleur
33d5fa38ef
Fix pdfBuildThirdpartyName must return main name. Alias should be an
...
option.
2016-02-24 13:30:16 +01:00
Ion Agorria
673f0c70a6
NEW: TimeZone can be supplied to mktime
2016-02-22 22:00:59 +01:00
Laurent Destailleur
f6d1913bb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-02-22 13:35:46 +01:00
Laurent Destailleur
355f091246
FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE
2016-02-22 13:28:08 +01:00
Laurent Destailleur
d3960b0809
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/member.lib.php
htdocs/expedition/card.php
2016-02-20 04:25:39 +01:00
aspangaro
d77a8bddcf
Fixed: Members - Problem of tab & missing language file
2016-02-19 07:39:14 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
761ad0114c
Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order
...
New add multicurrency on supplier proposal/order
2016-02-19 03:36:23 +01:00
Laurent Destailleur
3b5ce32cb0
Code comment
2016-02-19 01:47:00 +01:00
Laurent Destailleur
bd80249580
Fix code comment
2016-02-19 01:45:52 +01:00
Laurent Destailleur
633de3bcb4
Fix list of object referers should not be set to invoice by default (may
...
be module is disabed). I replace with a message to choose list.
2016-02-17 22:33:02 +01:00
phf
e24a35b904
New add multicurrency on supplier proposal/order
2016-02-16 23:58:21 +01:00
Laurent Destailleur
5268038e00
Minor css enhancement
2016-02-16 22:58:24 +01:00
Laurent Destailleur
c78997ed23
Tons of fixes and enhancement on recurring invoice generation
2016-02-16 00:31:05 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
Laurent Destailleur
1cf2b1b3af
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-15 01:19:57 +01:00
Laurent Destailleur
71a12824c9
Merge branch 'new_numbering_module_supplier_payment' of
...
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 00:31:33 +01:00
Laurent Destailleur
3925ae0742
Fix: we loose ability to refresh contact list when changing a company on
...
contact tab
2016-02-14 23:54:07 +01:00
aspangaro
47f60e1f8d
Add function img_weather
2016-02-13 07:53:50 +01:00
Laurent Destailleur
bc33b19d7d
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:24:15 +01:00
Raphaël Doursenaud
d038ca1875
FIX #4597 PHP 7 Uniform Variable Syntax
...
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
2016-02-11 20:01:51 +01:00
Laurent Destailleur
e67be201ed
NEW Can select number of lines on page list for projects and tasks
2016-02-11 16:49:13 +01:00
Laurent Destailleur
0d7f67ade5
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-10 23:59:15 +01:00
Laurent Destailleur
6662c1b5e1
NEW Can select dynamicaly number of lines to show on page on product,
...
shipment, contact, orders, thirdparties
Fix can make a shipment for product not predefined in multiwarehouse
mode
2016-02-10 23:37:34 +01:00
Laurent Destailleur
9b41e11a1e
NEW Can select dynamicaly number of lines to show on page
2016-02-10 20:48:18 +01:00
Laurent Destailleur
6dbaba6973
Fix: previous and next arrow
2016-02-10 17:45:26 +01:00
Laurent Destailleur
7ef0415aca
Small per enhancement
2016-02-09 15:57:24 +01:00
Laurent Destailleur
5c1c413c02
Fix warning
2016-02-09 15:44:34 +01:00
Laurent Destailleur
5ea9c6dd83
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.formprojet.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/accountancy.lang
2016-02-09 14:40:25 +01:00
Laurent Destailleur
f640bf7c61
Manage the reply-to field into mail libs
2016-02-09 11:56:12 +01:00
Laurent Destailleur
7445a0f71c
Clean code for generating sheet of barcode. Can choose output filename.
2016-02-08 16:42:34 +01:00
Laurent Destailleur
404663472a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-08 15:50:34 +01:00
Laurent Destailleur
0b6bd0bc14
More robust error management on barcode module.
2016-02-08 15:49:38 +01:00
Laurent Destailleur
fcf1e20d5b
Merge pull request #4578 from frederic34/sticker
...
Dictionnary for label sticker and card format
2016-02-08 14:49:31 +01:00
phf
d66bc6f1b3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-02-06 12:57:30 +01:00
frederic34
9c74af63af
Dictionnary for label sticker and card format
2016-02-06 12:06:05 +01:00
Laurent Destailleur
062deae24c
Merge
2016-02-05 12:18:50 +01:00
phf
a8e480e392
FIX #3509 payment ref for suppliers
2016-02-04 23:15:06 +01:00
phf
1b552a0b3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82
Fix warning when javascript disabled
2016-02-03 03:10:58 +01:00
Laurent Destailleur
e22664b8cf
FIX #4528
2016-02-03 01:01:14 +01:00
PeartreeG
4c0f29d234
Update fichinter.lib.php
2016-02-02 14:05:58 +01:00
Florian HENRY
3c94f5d4d4
Add log into next values
2016-02-02 11:38:32 +01:00
PeartreeG
c1ff21c30a
add fichinter link to resources
2016-02-01 16:09:58 +01:00
Laurent Destailleur
928336c835
NEW Clean and enhance code for cron engine
2016-01-31 15:14:50 +01:00
Laurent Destailleur
426e9297ea
Prepare code to match cron rule: 0 if ok, !=0 if error
2016-01-31 14:20:02 +01:00
PeartreeG
d1018760df
Update resource.lib.php
2016-01-31 12:24:19 +01:00
PeartreeG
4c025d4323
Adding additional tabs
2016-01-31 12:23:05 +01:00
mic9p
8faeac611a
Do not select siren but tva_intra from societe
...
VAT report by customer shows an empty field.
2016-01-30 15:35:28 +01:00
mic9p
827fd39658
Do not select siren but tva_intra from societe
...
VAT report by customer shows an empty field.
2016-01-30 10:35:57 +01:00
phf
4baff7898d
FIX insert FactureLigne
...
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
2016-01-26 22:18:31 +01:00
phf
8e933ebb2d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
2016-01-25 19:31:35 +01:00
Laurent Destailleur
469a44a4cf
NEW Include number of linked files into badge counter of "Linked files"
...
tab.
2016-01-23 17:23:00 +01:00
Laurent Destailleur
da93e35dbb
NEW Include number of linked files into badge counter of "Linked files"
...
tab.
2016-01-23 17:19:34 +01:00
Laurent Destailleur
4df584e57b
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
2016-01-23 11:45:39 +01:00
Laurent Destailleur
fedf1f3288
Fix view of product image when using old path
...
Fix size of image uploaded on user.
2016-01-22 14:02:48 +01:00
Laurent Destailleur
93b2013aa7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
d857b3475b
Fix doxygen
2016-01-22 03:07:46 +01:00
Laurent Destailleur
4e87afddf1
Fix: why a floating float here ?
2016-01-21 22:44:05 +01:00
Laurent Destailleur
35d9b25d82
Fix: why a floating float here ?
2016-01-21 22:43:20 +01:00
phf
68857499d7
NEW display multicurrency price on azur pdf model
2016-01-21 22:26:51 +01:00
phf
f7afbcff68
NEW integration of multicurrency module (creation fields in database and admin)
...
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
2016-01-21 21:38:52 +01:00
Laurent Destailleur
dd6e60630d
Fix size of cells make page too large even for large screen
2016-01-21 15:01:53 +01:00
Laurent Destailleur
19bcdb6910
Fix size of cells make page too large even for large screen
2016-01-21 14:56:26 +01:00
jfefe
7c4a9d140b
Replace reserved keyword "Resource" by "DolResource"
...
# Conflicts:
# htdocs/resource/list.php
2016-01-21 11:26:21 +01:00
Sergio Sanchis Climent
4d75039688
Edited correctly for check values
2016-01-21 11:20:27 +01:00
Sergio Sanchis Climent
0467dac43d
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-21 11:20:27 +01:00
Laurent Destailleur
03461d124a
Fix activation of cron jobs by external module
...
Clean code for task lists pages.
2016-01-19 23:45:03 +01:00
Laurent Destailleur
0f456c46ab
Clean project pages to work like other modules
2016-01-18 16:43:15 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
Laurent Destailleur
524614ded9
Start to work on a per type view of agenda
2016-01-14 16:52:46 +01:00
Laurent Destailleur
a6416b8797
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-14 15:00:59 +01:00
Laurent Destailleur
0951042dad
Fix: no need of translation tab if multilang was disabled.
2016-01-14 15:00:31 +01:00
Laurent Destailleur
0f5e208127
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-13 20:43:49 +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
Laurent Destailleur
8653e7fa5c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-10 00:12:51 +01:00
Juanjo Menent
c47e18b7e2
Merge pull request #4197 from atm-ph/new_mail_input_file_multiple
...
NEW hidden conf to use input file multiple from mail form
2016-01-09 17:57:50 +01:00
Juanjo Menent
c7ae943e57
Merge pull request #4311 from FHenry/develop
...
NEW : if nb total of lines provided in print barre_liste, display beside title
2016-01-09 17:52:05 +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
Sergio Sanchis Climent
dfdf58051e
Edited correctly for check values
2016-01-07 09:37:04 +01:00
Laurent Destailleur
2945d2d171
Fix bad condition to show tabs
2016-01-07 00:05:28 +01:00
bobby
7414e4c07c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-05 10:30:15 +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
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
bobby
46532ccb55
FIX/NEW : Accountancy
2015-12-28 11:08:14 +01:00
bobby
eec22169e3
FIX feature
2015-12-28 10:21:38 +01:00
bobby
10ff19eb46
NEW : if nb total of lines provided in print barre_liste, display in
...
title
2015-12-28 10:20:23 +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
ad5f65e988
Fix: use the mini image on tooltip of thirdparties
2015-12-21 17:32:57 +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
d7e9c92144
Fix bad link on category
...
Fix cancel button on categories
Css enhancement.
2015-12-19 13:55:27 +01:00
cla
cb96618460
Merge branch 'develop' into develop_sunimport
2015-12-18 10:49:57 +01:00
cla
ef487c48a4
NEW
...
Extrafields for:
- expedition, expeditiondet, livraison, livraisondet
2015-12-16 16:18:29 +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
aspangaro
687370071b
A function to remove zero at the end of the account
2015-12-14 21:38:30 +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
3680202c1c
Fix do not share color for title of table and title of pages
2015-12-13 14:39:12 +01:00
phf
2f5f6c9ead
NEW hidden conf to use input file multiple from mail form
2015-12-10 13:48:37 +01:00
Florian HENRY
96a95d6ae1
Debug accountancy on 3.9
2015-12-09 12:55:08 +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
ff4f1e7a5b
Debug 3.9
2015-12-05 19:20:39 +01:00
Laurent Destailleur
4a2bda3491
Look enhancement
2015-12-04 23:25:34 +01:00
Laurent Destailleur
5cd43d2df0
Some debug on new features
2015-12-04 20:51:34 +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
8c03e46a83
Removed a TODO
2015-12-04 18:33:57 +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
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
4dd1cb3e77
Theme MD looks ready for 3.9 now.
2015-12-04 12:12:12 +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
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
63879c1ca6
Merge pull request #4122 from mrsof/patch-7
...
FIX: Cannot set property '_renderItem of undefined
2015-12-03 11:52:30 +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
de730c9762
NEW Introduce cost price on product.
2015-11-30 21:20:45 +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
7b6d8dd23e
Fix for smartphone
2015-11-29 01:13:23 +01:00
Laurent Destailleur
5d5cfd498a
Add holiday date functions into PHPUnit
2015-11-28 19:54:16 +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
5b22eee938
FIX #4099
2015-11-28 16:11:15 +01:00
aspangaro
d12e3ca91f
Finish work on better integration of skype
2015-11-28 14:43:16 +01:00
aspangaro
9a2259c681
Correct button 'Export' and 'Write bookkeeping' on finance journal
2015-11-26 06:19:24 +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
Laurent Destailleur
cb3765bc92
Debug module Resource
2015-11-22 12:23:10 +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
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
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
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
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
552ecbcd95
Merge pull request #3964 from aspangaro/develop-hrm3
...
HRM : Work in progress
2015-11-21 00:14:41 +01:00
Drosis Nikos
ee4eb13fff
Update functions2.lib.php
2015-11-20 19:05:00 +02:00
Maxime Kohlhaas
9c1545bc1b
NEW add info page on product card
2015-11-19 14:45:05 +01:00
philippe grand
4f280f63d0
[Qual] Uniformize code
2015-11-19 13:59:58 +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
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
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
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
Laurent Destailleur
b75923871c
FIX: Too many information were hidden. A lot of users still need bank
...
account on PDF.
2015-11-14 14:56:44 +01:00
Laurent Destailleur
5e67eefff3
Removed phpcs warning
2015-11-13 12:48:17 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Laurent Destailleur
682842f15f
Fix into title of login page, we must report the tru dolibarr version
...
after the @ (technical information), event if application name/version
was replaced with a constant.
2015-11-13 10:37:51 +01:00
aspangaro
0f75d76296
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-13 07:52:44 +01:00
Laurent Destailleur
9a98206d5a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-13 03:36:08 +01:00
Laurent Destailleur
64c783623b
NEW Framework feature. To have a page being loaded at same scrollbar
...
level wafter a click on a href link, just add the class "reposition" on
this link.
2015-11-13 03:35:55 +01:00
Laurent Destailleur
7d9fde803b
Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter
...
NEW Develop multi type event filter
2015-11-13 02:27:53 +01:00
Laurent Destailleur
4065b3f1df
Better management of the Dolibarr tracking id into email.
...
This will allow an imap scanner to link email
2015-11-13 00:19:11 +01:00
Alexis Algoud
a2c8c7c20e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-12 09:05:26 +01:00
aspangaro
7693b407e8
HRM: Begin to work on employee card
2015-11-12 06:59:40 +01:00
Alexis Algoud
99513ac9f3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-09 18:31:21 +01:00
Alexis Algoud
68cbd4699b
NEW multi event type for filter and get form in order to allow bookmark
2015-11-09 17:18:23 +01:00
Marcos García de La Fuente
7ebe032d6f
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
...
Close #3865
2015-11-08 16:01:12 +01:00
Marcos García de La Fuente
4a52d3c1b1
Removed unwanted change
2015-11-07 15:35:00 +01:00
