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

56102 Commits

Author SHA1 Message Date
Laurent Destailleur
3a8ceb130f Fix utf8 on all fields 2018-01-19 15:17:19 +01:00
Laurent Destailleur
9d0a0ed867 Fix demo 2018-01-19 12:55:03 +01:00
Laurent Destailleur
0296661864 Complete the demo profile 2018-01-19 12:39:47 +01:00
Jan Giebels
9642206bd1 Fix label generation for fichinter card generation from order. Labels get concatenated. 2018-01-19 12:21:42 +01:00
Laurent Destailleur
a892a3fe71 Fix info of collation is wrong on log 2018-01-19 12:10:03 +01:00
Laurent Destailleur
937a27396f Fix log of install disappear. 2018-01-19 11:43:55 +01:00
Jan Giebels
d01a8d0508 Added order status =1 or =2 for overview 2018-01-19 11:22:25 +01:00
All-3kcis
a58a3f893d Fix #8058 2018-01-19 10:21:48 +01:00
Laurent Destailleur
d967527b58 Fix status was not refreshed 2018-01-18 18:40:01 +01:00
Laurent Destailleur
768c93a707 Fix suggested amount for direct debit order 2018-01-18 18:22:10 +01:00
Laurent Destailleur
1730feeb4f Fix error message 2018-01-18 17:52:48 +01:00
Maxime Kohlhaas
4c0dc21ca0 Fix validate contrat was not using force_number parameter 2018-01-18 14:07:32 +01:00
Laurent Destailleur
3871c694f6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-17 19:50:33 +01:00
Laurent Destailleur
57f664c0c1 Fix vat npr for template invoices 2018-01-17 19:45:23 +01:00
Laurent Destailleur
4034122169 Fix usage of PAYMENT_SECURITY_TOKEN 2018-01-17 18:00:05 +01:00
Laurent Destailleur
81999be027 Fix lose filter type 2018-01-17 17:29:17 +01:00
Laurent Destailleur
756838c3a0 Fix lose filter type 2018-01-17 17:13:50 +01:00
Laurent Destailleur
56d702e3c6 Fix missing property in tooltip 2018-01-17 16:26:24 +01:00
Laurent Destailleur
bc7bd77cea Fix permission to open supplier order 2018-01-17 15:54:27 +01:00
Laurent Destailleur
1e9ddf153c Fix workboard not visible on smartphone, so i invert position with stats 2018-01-17 13:55:53 +01:00
Laurent Destailleur
dcd579242f Fix <br /> (xml) into <br> (html) 2018-01-17 13:26:57 +01:00
Laurent Destailleur
2e0ec5e76a Fix <br> 2018-01-17 13:17:33 +01:00
Laurent Destailleur
be821716f0 code comment 2018-01-17 12:26:20 +01:00
Laurent Destailleur
0a85a4702a Fix https 2018-01-17 11:41:03 +01:00
Laurent Destailleur
ef5939fe78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-17 11:20:32 +01:00
Laurent Destailleur
1a04178d64 Clean unused file and fix missing translation 2018-01-17 11:20:18 +01:00
Laurent Destailleur
3f551f0d05 Fix migration 2018-01-17 02:19:32 +01:00
Laurent Destailleur
a84ed841cc Fix creation date was not filled 2018-01-16 20:47:33 +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
5d4eda68e0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-16 19:53:02 +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
Laurent Destailleur
1c3fb7f94b Fix responsive of boxes 2018-01-16 16:15:49 +01:00
Laurent Destailleur
f307fecaf6
Merge pull request #8064 from atm-quentin/6.0 
FIX missing hook invoice index
 2018-01-16 12:15:06 +01:00
Laurent Destailleur
51421a8bf6 Fix position of fields 2018-01-15 18:11:56 +01:00
Laurent Destailleur
25d59cf107 Fix sort on common fields 2018-01-15 18:05:15 +01:00
Laurent Destailleur
3d34a839a3 Doc 2018-01-15 17:43:18 +01:00
Laurent Destailleur
926683763b Modulebuilde fix sort of fields, fix generation of files 2018-01-15 17:38:15 +01:00
atm-quentin
6feacab4f5 FIX missing hook invoice index 2018-01-15 14:24:19 +01:00
Laurent Destailleur
bc2009874d Fix code comment 2018-01-15 12:59:30 +01:00
Laurent Destailleur
4c8af0ff50 Fix name alias on list 2018-01-15 12:24:56 +01:00
Laurent Destailleur
b154357683
Merge pull request #7982 from simnandez/6.0 
FIX: Bad name alias showing in name of third column
 2018-01-15 12:22:40 +01:00
Laurent Destailleur
3b9aee7d4c
Update list.php 2018-01-15 12:22:21 +01:00
Laurent Destailleur
e4c02152b3 Fix navigation in bookeeping view grouped by account 2018-01-15 12:14:18 +01:00
Laurent Destailleur
04a5dc79e9
Merge pull request #8054 from artis-auxilium/accounting_searchdate_fiscalyear 
Accounting searchdate fiscalyear
 2018-01-15 11:38:04 +01:00
Laurent Destailleur
926f39fc2b
Merge pull request #8060 from atm-maxime/fix_blockaedlog_migration 
Fix blockedlog triggers fatal error in migration script
 2018-01-15 11:34:48 +01:00
Laurent Destailleur
c29bfcef31
Merge pull request #8053 from Oeris/develop-api 
FIX use DB PREFIX instead of llx_
 2018-01-15 11:33:09 +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
Laurent Destailleur
64fd5154c9
Merge pull request #8052 from hregis/develop_multicompany 
Fix: regression and broken feature
 2018-01-15 11:31:07 +01:00
Laurent Destailleur
68f0808d16
Update societe.class.php 2018-01-15 11:30:32 +01:00
Laurent Destailleur
b8688a46d3
Update contact.class.php 2018-01-15 11:30:11 +01:00
fappels
00185bd9d4 Fix fetchCommon should return 0 iso error if not found 2018-01-15 11:21:24 +01:00
Laurent Destailleur
3410e29755 CSS 2018-01-15 11:20:45 +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
Laurent Destailleur
3c3402bc60 Debug API for prices of products 2018-01-14 15:58:04 +01:00
fappels
d6ed968c51 html modulebuilder type is a text type in database 2018-01-14 15:41:37 +01:00
fappels
25b455272a Fix 0 is a valif value for a NOT NULL field 2018-01-14 15:31:31 +01:00
Laurent Destailleur
133e87fcc3 Sync transifex 2018-01-14 12:45:26 +01:00
Maxime Kohlhaas
36afa87fb5 Fix blockedlog triggers fatal error in migration script 2018-01-14 11:56:45 +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
debc758134 Fix code comment 2018-01-14 01:40:12 +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
1f2d275ef2 Fix conditions of some fields 2018-01-13 17:21:56 +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
aa1692483f Fix colspan 2018-01-13 16:06:04 +01:00
Laurent Destailleur
8d793c680e Fix dol_delete_preview 2018-01-13 15:48:30 +01:00
Laurent Destailleur
7a88afe962 Fix field enabled and perms must differs 2018-01-13 13:16:33 +01:00
Laurent Destailleur
3bcf1d9da6 Fix css 2018-01-13 12:08:24 +01:00
Laurent Destailleur
53b36435d0 Fix on smartphone 2018-01-12 20:50:18 +01:00
Laurent Destailleur
854a71726c Fix lose filters 2018-01-12 20:32:30 +01:00
Laurent Destailleur
5fb8672221 Fix blockedlog. Browser can be used with large amount of events 2018-01-12 20:24:09 +01:00
Laurent Destailleur
8014f7d822 Fix blockedlog module must store ref of invoice once validated 2018-01-12 19:09:43 +01:00
Laurent Destailleur
d0680b429f Fix name of file saved from tax document tab 2018-01-12 17:39:20 +01:00
Laurent Destailleur
7bfcfd4574 Fix recursive path when dir is '0' 2018-01-12 17:12:38 +01:00
Laurent Destailleur
32a998e68d Fix preview link 2018-01-12 16:28:10 +01:00
Laurent Destailleur
8b972313ae Fix scrutinizer 2018-01-12 15:38:53 +01:00
Laurent Destailleur
ad4b59d2c8 Fix scrutinizer 2018-01-12 15:33:21 +01:00
Laurent Destailleur
92f8fc8b85 Fix scrutinizer 2018-01-12 15:26:50 +01:00
Laurent Destailleur
ac8a7f064a More robust code 2018-01-12 15:23:56 +01:00
Laurent Destailleur
64ae70d106 Fix scrutinizer bug 2018-01-12 15:20:17 +01:00
Laurent Destailleur
7da9911db1 Fix message 2018-01-12 15:06:50 +01:00
Laurent Destailleur
28207ad4cb Clean var 2018-01-12 14:57:02 +01:00
Laurent Destailleur
a44363ce3d Fix responsive 2018-01-12 14:41:57 +01:00
Laurent Destailleur
4f8a447d30 Fix alignement 2018-01-12 14:09:51 +01:00
Laurent Destailleur
50596a5214 Fix trans key 2018-01-12 14:06:48 +01:00
Laurent Destailleur
6c9d5984a2 Fix trans key 2018-01-12 14:03:03 +01:00
Laurent Destailleur
3423d4e6d3 Fix balance is amount after, so i fix by adding amount before 2018-01-12 13:35:53 +01:00
Regis Houssin
20ad3b0e80 Fix: if $entity is empty '' the isset return true !! 2018-01-12 10:39:15 +01:00
Regis Houssin
93d5c818c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_multicompany 2018-01-12 10:35:22 +01:00
Laurent Destailleur
f0a10cdcc1 Missing backlink 2018-01-12 10:32:48 +01:00
Laurent Destailleur
95d2a9f88d Responsive and css 2018-01-12 01:10:03 +01:00
Laurent Destailleur
5e7b814966 Fix responsive 2018-01-12 00:16:55 +01:00
Laurent Destailleur
f93f9e1a73 Fix regression 2018-01-11 20:39:23 +01:00
Laurent Destailleur
eaecb9da5e CSS 2018-01-11 20:33:09 +01:00
Laurent Destailleur
b225a6f79c Better translation 2018-01-11 20:19:53 +01:00
Laurent Destailleur
e56d74f5c4 Fix generation of doc for supplier payment 2018-01-11 19:01:47 +01:00
Laurent Destailleur
e152e81d18 Fix close code 2018-01-11 18:24:40 +01:00
Laurent Destailleur
0b893c11fd Revert "Fix wrong address used into PDF model of supplier payment" 
This reverts commit 22d92c0540.
 2018-01-11 18:09:05 +01:00
Laurent Destailleur
15ed7584b8 Fix navigation in accounting account card 2018-01-11 17:06:06 +01:00
dev2a
60c508b1c4 Get start date from fiscal year 
if start date is empty, get date from current accounting fiscal year, else from company fiscal month setting
 2018-01-11 15:52:45 +01:00
dev2a
415d7574eb Fix PHP notices adding empty($page) 2018-01-11 15:35:34 +01:00
Laurent Destailleur
6d9a9dd3fe Fix Time spent for "other task" was not visible when filtering project 2018-01-11 13:08:13 +01:00
Neil Orley
8d710020e9 FIX use DB PREFIX instead of llx_ 2018-01-11 12:58:41 +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
Regis Houssin
157e118cba Fix: broken feature 2018-01-11 10:47:40 +01:00
Laurent Destailleur
95312d1944 Fix regression 2018-01-11 10:20:49 +01:00
Laurent Destailleur
a4ab37e990 Remove deprecated field 2018-01-11 01:16:14 +01:00
Laurent Destailleur
d74305d333 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-11 01:14:40 +01:00
Laurent Destailleur
90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
 2018-01-11 01:14:20 +01:00
Laurent Destailleur
764646634d
Merge pull request #8051 from atm-florian/6.0 
fix: search translation into external module files also
 2018-01-11 01:12:53 +01:00
Laurent Destailleur
4316793638
Merge pull request #8047 from hregis/develop_multicompany 
Fix: some bugs with multicompany sharing
 2018-01-11 01:07:17 +01:00
Laurent Destailleur
a11cb8dcbf
Update card.php 2018-01-11 01:06:50 +01:00
Laurent Destailleur
0ae02d76a3
Merge pull request #8049 from fmarcet/6.0 
Fix: Still using property ->client instead of ->thirdparty.
 2018-01-11 01:03: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
205e715b7f
Merge pull request #8046 from hregis/6.0_bug 
Fix: avoid Warning: A non-numeric value encountered
 2018-01-11 00:53:07 +01:00
Laurent Destailleur
b2c900011c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-11 00:48:10 +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
e41f761157 Fix ident 2018-01-11 00:47:29 +01:00
Laurent Destailleur
9827358002
Merge pull request #8040 from atm-florian/dev_fixsecu 
fix #7963
 2018-01-11 00:44:45 +01:00
Laurent Destailleur
4747e84b74
Update price.php 2018-01-11 00:40:33 +01:00
Laurent Destailleur
79562f8d5b
Merge pull request #8036 from atm-ph/fix_6.0_model_pdf_invoice_payment 
Fix wrong address used into PDF model of supplier payment
 2018-01-11 00:37:37 +01:00
Laurent Destailleur
b5fe953a64
Merge pull request #8035 from pdermody/6.0 
Fix #8034 - Surface and volume units are calculated incorrectly
 2018-01-11 00:36:00 +01:00
Laurent Destailleur
436b653fa0 Error report 2018-01-11 00:16:45 +01:00
florian HENRY
c8c550cd33 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0 2018-01-10 20:49:48 +01:00
HENRY Florian
5af39e80e0
Update price.php 2018-01-10 20:38:06 +01:00
florian HENRY
0bd45dc64b fix: search translation into external module files also 2018-01-10 20:34:32 +01:00
Laurent Destailleur
f2b8c3c97d Fix check of customer/supplier code 2018-01-10 18:19:54 +01:00
Ferran Marcet
d99535d9da Fix: Still using property ->client instead of ->thirdparty. 2018-01-10 16:40:43 +01:00
Regis Houssin
8c3b4f62db Fix: wrong entity with thirdparty sharing 2018-01-10 13:30:57 +01:00
Laurent Destailleur
43d560830c Fix on old php 2018-01-10 13:20:43 +01:00
Laurent Destailleur
e141d43999 Fix bad links with mobile 2018-01-10 13:14:30 +01:00
Laurent Destailleur
ae59ca43cc Fix sort of subscriptions 2018-01-10 13:02:05 +01:00
Regis Houssin
4683a35532 Fix: wrong image path with multicompany sharing 2018-01-10 12:52:30 +01:00
Regis Houssin
4cc0e889c1 Fix: restore broken feature 2018-01-10 12:38:27 +01:00
Regis Houssin
bd1acca2cd Fix: wrong entity with multicompany thirdparty sharing 2018-01-10 12:38:12 +01:00
Laurent Destailleur
cda078ce26 Fix test on email unique 2018-01-10 12:27:11 +01:00
Laurent Destailleur
e5c26f89e7 Fix search link 2018-01-10 11:08:52 +01:00
Laurent Destailleur
49f59e0d06 Fix menu visible in experimental mode 2018-01-10 11:02:11 +01:00
Regis Houssin
0f51aa15d8 Fix: avoid Warning: A non-numeric value encountered 2018-01-10 10:52:30 +01:00
Laurent Destailleur
bc9fc2828a Fix missing class 2018-01-10 10:42:36 +01:00
Laurent Destailleur
167ab17927 Fix substitution of user_signature 2018-01-10 10:31:27 +01:00
Laurent Destailleur
9b448459c9 Fix dispatching replacement invoice into bookkeeping (not used by most 
countries in europe)
 2018-01-09 19:12:08 +01:00
dolibarr95
6fdbd4cc17
Update company.lib.php 2018-01-09 14:29:01 +01:00
Laurent Destailleur
9f79ad800b Fix price per quantity 2018-01-09 14:20:47 +01:00
dolibarr95
b9b42e3e9d
Add class 
Add oddeven class to show_contacts() list.
 2018-01-09 14:04:18 +01:00
florian HENRY
fdedd6f75b fix 7963 2018-01-08 20:54:40 +01:00
atm-ph
22d92c0540 Fix wrong address used into PDF model of supplier payment 2018-01-08 15:25:18 +01:00
Laurent Destailleur
9844352193 More complete repair 2018-01-08 15:04:17 +01:00
Laurent Destailleur
42e659e26c Fix link for online payment 2018-01-08 13:21:04 +01:00
Laurent Destailleur
5847ea7319 Fix var_dump 2018-01-08 12:44:55 +01:00
Laurent Destailleur
5ebba6fead Fix example 2018-01-08 12:41:22 +01:00
Laurent Destailleur
40f2644520 Fix example 2018-01-08 12:31:11 +01:00
Laurent Destailleur
968bb8a100 Fix travis 2018-01-08 02:15:20 +01:00
Laurent Destailleur
f653adeb71 Fix phpcs 2018-01-08 02:00:06 +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
e256a1d57e Code comment 2018-01-08 00:05:26 +01:00
Laurent Destailleur
9254782ad7 Fix init template of non page 2018-01-07 22:04:31 +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
9fd257d2f7 Fix rename of dir from filemanager 2018-01-07 19:38:20 +01:00
Laurent Destailleur
280059a3d7 Fix perm 2018-01-07 18:56:57 +01:00
Laurent Destailleur
a92f60416a Fix permissions 2018-01-07 18:52:35 +01:00
Laurent Destailleur
da4417dfc8 Fix website in multicompany mode 2018-01-07 18:33:20 +01:00
Laurent Destailleur
2812dae3b3 Fix website in multicompany mode 2018-01-07 18:28:47 +01:00
Laurent Destailleur
82fcf3cbdb CSS 2018-01-07 16:53:59 +01:00
Laurent Destailleur
e6ffaa0f8b Fix option MAIN_SHOW_TECHNICAL_ID 2018-01-07 16:41:45 +01:00
Laurent Destailleur
140ee422a4 NEW Add chart of account for england 2018-01-05 22:06:40 +01:00
Laurent Destailleur
a37019a25b NEW Add chart of account for england 2018-01-05 22:04:43 +01:00
Laurent Destailleur
b9015de7e2 Fix can't edit payment mode / default bank account 2018-01-05 19:52:23 +01:00
Laurent Destailleur
4f409b802e Fix switch extrafield password/text 2018-01-05 18:16:40 +01:00
Laurent Destailleur
35a710a8ed Missing translation 2018-01-05 17:50:05 +01:00
Laurent Destailleur
70cfec37b1 Fix add of free entry into bank account 2018-01-05 17:38:21 +01:00
Laurent Destailleur
5580cedfdc Fix add of free entry into bank account 2018-01-05 17:35:28 +01:00
Laurent Destailleur
f826696aa1 Add the status of record into blockedlog export 2018-01-05 13:40:56 +01:00
Laurent Destailleur
332ee53c22 Fix module blockedlog for donation 2018-01-05 12:43:53 +01:00
sschwebel
7e8fda2d71 FIX #8029 Unable to make leave request in holyday module 
wrong variable name in card.php
 2018-01-05 12:09:45 +01:00
Laurent Destailleur
dbf7603118 Debug blockedlog for loi finance 2016 2018-01-05 04:31:48 +01:00
Laurent Destailleur
1e438b7ebd Fix travis and return of api that change status 2018-01-05 02:01:57 +01:00
Laurent Destailleur
940e9cb1a5 Fix travis error 2018-01-05 01:46:07 +01:00
Laurent Destailleur
d7837f8800 Try fix for #7778 2018-01-05 01:43:51 +01:00
Laurent Destailleur
e7527ca4b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-05 01:30:32 +01:00
Laurent Destailleur
0fb95fa15f Try a fix for #7778 2018-01-05 01:30:12 +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
45ed5c20ea
Merge pull request #8011 from frederic34/patch-1 
Update card.php
 2018-01-04 23:57:53 +01:00
Laurent Destailleur
dd8e7d657f
Update card.php 2018-01-04 23:57:45 +01:00
Laurent Destailleur
a3c6746b6f Merge #8008 manually 2018-01-04 23:50:15 +01:00
Laurent Destailleur
1464937c66 Merge #8008 manually 2018-01-04 23:44:21 +01:00
Laurent Destailleur
f19fb90ab0 Merge #8008 manually 2018-01-04 23:36:14 +01:00
Laurent Destailleur
6b8c7239cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-04 21:07:05 +01:00
Laurent Destailleur
5400bee3ed Fix title 2018-01-04 21:06:39 +01:00
Laurent Destailleur
f25b2ebc51
Merge pull request #8026 from c3do/patch-3 
Fix #8026 Remove PHP Warning adding empty($page)
 2018-01-04 21:04:33 +01:00
Laurent Destailleur
460bdd441a
Merge pull request #8025 from c3do/patch-2 
Fix #8025 Remove PHP Warning adding empty($page)
 2018-01-04 21:04:22 +01:00
Laurent Destailleur
055d0e138e
Merge pull request #8024 from c3do/patch-1 
Fix #8024 Remove PHP notices adding empty($page)
 2018-01-04 21:04:12 +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
301f509611
Merge pull request #8019 from atm-gauthier/6.0_fix_vat_mass_update 
FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false
 2018-01-04 21:03:20 +01:00
Laurent Destailleur
550fc37e62
Merge pull request #8017 from atm-florian/6.0 
fix : linked object (new format  of linked_object atribut on 6.0)
 2018-01-04 21:02:31 +01:00
Laurent Destailleur
a14a3db2e9
Merge pull request #8013 from atm-john/FIX_invoice_filter_type 
fix filter for TYPE_SITUATION invoice
 2018-01-04 20:59:32 +01:00
Laurent Destailleur
e4d37c3e23
Merge pull request #8012 from ATM-Nicolas/fix_product_best_price 
Fix product best price
 2018-01-04 20:58:59 +01:00
Laurent Destailleur
60976c08e4
Merge pull request #8010 from atm-john/FIX_supplier_invoice_lines_extrafields_reception 
Fix extrafields transmition from supplier order to supplier invoice : lines part
 2018-01-04 20:57:20 +01:00
Laurent Destailleur
cc24634cfd
Merge pull request #8007 from atm-florian/develop 
fix #8004
 2018-01-04 20:56:38 +01:00
Laurent Destailleur
90e9b3db68 Fix look and feel v7 2018-01-04 20:42:57 +01:00
Laurent Destailleur
e10a9912dc Fix missing worload 2018-01-04 19:54:30 +01:00
Laurent Destailleur
6b77dc3b5d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2018-01-04 19:30:25 +01:00
Laurent Destailleur
b2feac9d90 CVE-2017-17971 2018-01-04 19:25:52 +01:00
Laurent Destailleur
01cde59608 Fix filter on bookkeeping group view 2018-01-04 19:16:53 +01:00
Laurent Destailleur
56b27a3a11 Fix: do no lose filter when deleting a bookeeping transaction 2018-01-04 19:03:01 +01:00
Laurent Destailleur
ebc76b5f27 Fix tooltips on thirdparty and invoice 2018-01-04 18:29:12 +01:00
Juanjo Menent
762ab74940 FIX: Cashdesk should not sell to inactive third parties 2018-01-04 18:09:25 +01:00
Juanjo Menent
9471495dca Merge remote-tracking branch 'upstream/6.0' into 6.0 2018-01-04 18:05:55 +01:00
Cédric
4ed86c830a
Fix PHP Warning 
Warning: A non-numeric value encountered in dolibarr/htdocs/accountancy/bookkeeping/list.php on line 89
 2018-01-04 17:42:23 +01:00
Cédric
777ed43e75
Remove PHP notices adding empty($page) 2018-01-04 17:31:59 +01:00
Cédric
41fec45daf
Fix PHP notices adding empty($page) 2018-01-04 16:23:25 +01:00
Laurent Destailleur
59ed23069c Fix debug accounting module 2018-01-04 15:52:07 +01:00
KHELIFA
7d824b3ef2 Fix: Access rights for resource in multi-entities 2018-01-04 15:05:11 +01:00
Laurent Destailleur
f4c62a3bd9 Fix ui 2018-01-04 14:54:04 +01:00
Laurent Destailleur
300d4e1603 Fix disable direct debit request for replaced invoices 2018-01-04 14:35:02 +01:00
Laurent Destailleur
c4eba665d0 Fix order of task in gantt diagram 2018-01-04 13:52:37 +01:00
Laurent Destailleur
04dd0663ff Fix translation 2018-01-04 12:17:32 +01:00
gauthier
58470e0913 FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false 2018-01-04 12:01:21 +01:00
Laurent Destailleur
b3465d441a Missing ajaxcombobox 2018-01-04 10:45:48 +01:00
Laurent Destailleur
f6007045f5 Fix search filters 2018-01-04 00:23:08 +01:00
Laurent Destailleur
6bc8268dc5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-01-03 23:35:15 +01:00
Laurent Destailleur
534cbcb941 Debug translation 2018-01-03 20:59:35 +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
f6ff6610e4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-03 20:13:56 +01:00
Laurent Destailleur
c7798d11ce Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-03 20:13:17 +01:00
florian HENRY
25390e5f73 fix : linked object (new format of linked_object atribut on 6.0) 2018-01-03 17:03:00 +01:00
Laurent Destailleur
bc1f741600 Fix duplicate instructions 2018-01-03 14:46:18 +01:00
florian HENRY
2bd8bafc1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2018-01-03 12:06:59 +01:00
Laurent Destailleur
c3f8012dfb Update vat rates 2018-01-02 23:05:40 +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
ATM-Nicolas
2e6c036ad8 Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_product_best_price 2018-01-02 17:22:53 +01:00
ATM-Nicolas
61efda4cbd FIX : product best price on product list 2018-01-02 17:21:04 +01:00
John
1331e8add7 fix filter for TYPE_SITUATION invoice 2018-01-02 17:19:42 +01:00
Frédéric FRANCE
aaff13a984
Update card.php 2018-01-02 14:28:52 +01:00
John
9180121999 Fix extrafields transmition from supplier order lines to supplier invoice lines 2018-01-02 12:06:11 +01:00
florian HENRY
320465aeb9 fix : #8003 2018-01-02 09:46:45 +01:00
florian HENRY
abe53cad05 fix #8004 2018-01-02 09:36:37 +01:00
Laurent Destailleur
24a59a7731
Merge pull request #8002 from fappels/7.0_fix_on_fix_mail_trigger 
Fix on #7981 sendmail trigger error
 2017-12-31 12:53:02 +01:00
fappels
b6e3d312ad Fix on #7981 
Trigger interface does not set error eventmessage.
Improvement:
Show both trigger error and mail send succesful, so you know mail was
send succesful bot some trigger action after sending mail failed.
 2017-12-30 12:12:13 +01:00
Frédéric FRANCE
0fae2ba8ca
correct merge 2017-12-29 20:41:39 +01:00
Laurent Destailleur
77be56ff74
Merge pull request #7991 from defrance/patch-103 
Add project column on proposal list
 2017-12-28 13:03:03 +01:00
Laurent Destailleur
af8ebc616b
Update list.php 2017-12-28 13:02:26 +01:00
Laurent Destailleur
0abe19c30d
Merge pull request #7998 from hregis/6.0_bug 
Fix: avoid warning
 2017-12-28 12:53:04 +01:00
Laurent Destailleur
9ac99caffe
Merge pull request #7995 from frederic34/patch-1 
Update propal.class.php
 2017-12-28 12:51:44 +01:00
Laurent Destailleur
b0fefffcf8 Fix standardize api code 2017-12-28 12:44:15 +01:00
Laurent Destailleur
ce680af357 Fix field name and length (database portabilit) 2017-12-28 11:16:27 +01:00
Laurent Destailleur
6676178435 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/contrat/card.php
 2017-12-28 09:56:40 +01:00
Laurent Destailleur
bbcf70cf4e Remove spaces 2017-12-28 09:48:41 +01:00
Laurent Destailleur
3ac413084f
Merge branch '6.0' into 6.0 2017-12-28 08:46:22 +01:00
Laurent Destailleur
836a94fab2
Merge pull request #7988 from OPEN-DSI/core_pdf_modele_propal_payment_mode_flag 
Fix PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE
 2017-12-28 07:18:57 +01:00
Laurent Destailleur
3d4e6c9169
Merge pull request #7987 from atm-arnaud/FIX_trans_product_stats 
FIX stats trad for customerinvoice
 2017-12-28 07:10:14 +01:00
Laurent Destailleur
56bc0dbd25
Merge pull request #7986 from atm-arnaud/FIX_contractline_trans_unactivate 
FIX trans unactivate on contractline
 2017-12-28 07:09:28 +01:00
Laurent Destailleur
31b5d9df52
Merge pull request #7985 from atm-arnaud/FIX_search_contact_list 
FIX search on contact list
 2017-12-28 07:07:47 +01:00
Laurent Destailleur
8476567dc6
Merge pull request #7981 from fappels/7.0_sendmail_trigger_error 
Fix action_sendmail.inc
 2017-12-28 07:01:02 +01:00
Laurent Destailleur
de305cb3b2
Merge pull request #7980 from hregis/6.0_bug2 
Fix: avoid php warning
 2017-12-28 06:53:09 +01:00
Laurent Destailleur
fcf42802a3 More example for website 2017-12-27 21:13:42 +01:00
Laurent Destailleur
5264aec853 Add js into export of website 2017-12-27 20:21:19 +01:00
Laurent Destailleur
8388858715 Fix filemanager 2017-12-27 20:17:08 +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
Frédéric FRANCE
80618d56ac
Update propal.class.php 2017-12-26 16:12:28 +01:00
Ferran Marcet
1c7b99d3dc Fix: Missing include for Project class 2017-12-26 12:13:35 +01:00
Juanjo Menent
b650ba21c4 Merge remote-tracking branch 'upstream/6.0' into 6.0 2017-12-26 10:52:46 +01:00
Laurent Destailleur
768cc19bbc Fix protection on tpl to avoid direct url call 2017-12-24 15:07:06 +01:00
Laurent Destailleur
07f1dd7dae Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-24 15:03:09 +01:00
Laurent Destailleur
644e8b5a05 Fix navigation on stock 2017-12-24 15:02:15 +01:00
Laurent Destailleur
fdac3078e2 Fix permissions 2017-12-24 14:42:51 +01:00
Laurent Destailleur
b70dd36ffa Better js comment 2017-12-24 12:16:48 +01:00
BENKE Charlene
df884e4080
Add project column on proposal list 
if project are not enabled we don't display it
 2017-12-23 18:37:08 +01:00
Laurent Destailleur
e6c7f9e69b Debug module inventory 2017-12-22 21:29:09 +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
f0c8b548f3 Fix bugs reported by scrutinizer 2017-12-22 14:24:31 +01:00
Laurent Destailleur
493669e986 Fix look and feel v7 2017-12-22 14:19:12 +01:00
Laurent Destailleur
e839c72109 Fix css 2017-12-22 14:05:49 +01:00
Laurent Destailleur
fb8326a9bb Css use roboto but files does not exists 2017-12-22 12:56:29 +01:00
Laurent Destailleur
3b54be5dac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/product/price.php
 2017-12-22 12:55:16 +01:00
Laurent Destailleur
2b056b0177 BUG Fix of old hidden feature price per quantity 2017-12-22 12:53:46 +01:00
Laurent Destailleur
ff245aa646 BUG Fix of old hidden feature price per quantity 2017-12-22 10:56:52 +01:00
Laurent Destailleur
d1cfbc2906 Code comment 2017-12-22 01:03:40 +01:00
Laurent Destailleur
207730bf63 Css 2017-12-22 00:22:33 +01:00
Laurent Destailleur
27a9a81f99 Fix link to contracts 2017-12-21 23:48:33 +01:00
KHELIFA
d069ccdb7f Core Modele PDF: Fix globale variable for hide payment mode with PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE 
- Fix hide payment condition for supplier proposal
 2017-12-21 16:58:37 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
Laurent Destailleur
6a96a9765f Transifex sync 2017-12-21 15:04:04 +01:00
Laurent Destailleur
eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
 2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960 FIX security vulnerability reported by ADLab of Venustech 2017-12-21 13:32:16 +01:00
Laurent Destailleur
62f895e2ec Fix: avoid infinite loop 2017-12-21 13:31:39 +01:00
Laurent Destailleur
4a5988accb FIX security vulnerability reported by ADLab of Venustech 2017-12-21 12:52:19 +01:00
arnaud
b1ce3fc5c8 FIX stats trad for customerinvoice 2017-12-21 12:12:50 +01:00
arnaud
4ba039d229 FIX trans unactivate on contractline 2017-12-21 12:07:29 +01:00
arnaud
ae7f8c3fe4 FIX search on contact list 2017-12-21 12:01:30 +01:00
Laurent Destailleur
54d7d85d90 Sync transifex 2017-12-21 11:47:35 +01:00
Laurent Destailleur
e8a141aa63 Add uruguay languages 2017-12-21 11:37:51 +01:00
Laurent Destailleur
635917d0e6 CSS 2017-12-20 21:33:45 +01:00
Laurent Destailleur
f1305bbdd6 Fix css 2017-12-20 21:14:22 +01:00
Laurent Destailleur
d20062df73 Fix jquery css theme 2017-12-20 20:18:41 +01:00
Laurent Destailleur
9ea2fe226d Fix look and feel v6 2017-12-20 19:30:30 +01:00
Laurent Destailleur
b03d0134a7 Filter on date extrafield timestamp and datetime disabled (not possible 
yet)
 2017-12-20 18:30:41 +01:00
fappels
4bc2e80ba8 Fix sending expense reports 2017-12-20 17:20:40 +01:00
Juanjo Menent
dc930dd6c5 FIX: Bad name alias showing in name of third column 2017-12-20 16:46:49 +01:00
Laurent Destailleur
3f6b3b51ca Fix css 2017-12-20 15:09:58 +01:00
Laurent Destailleur
9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/main.inc.php
 2017-12-20 13:28:41 +01:00
Laurent Destailleur
6900771c70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-12-20 13:17:39 +01:00
Laurent Destailleur
ca8ae3c723 Fix option MAIN_USE_JQUERY_JEDITABLE 2017-12-20 13:17:21 +01:00
Laurent Destailleur
b1f98b5903 Fix inline edit 2017-12-20 12:45:38 +01:00
fappels
7da1f706e5 Error in send_mail trigger is not system error 2017-12-20 12:25:30 +01:00
Regis Houssin
2821459894 Fix: avoid php warning 2017-12-20 11:36:51 +01:00
Laurent Destailleur
846453e94b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-19 18:26:49 +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
d51ae72eb4
Merge pull request #7965 from Oeris/develop-api 
NEW improvements of invoices, orders and proposals in the REST API
 2017-12-19 18:17:48 +01:00
Laurent Destailleur
57603e3df4
Update api_invoices.class.php 2017-12-19 18:16:39 +01:00
Laurent Destailleur
bffed79132
Update api_invoices.class.php 2017-12-19 18:06:05 +01:00
Laurent Destailleur
3635e88396
Update api_proposals.class.php 2017-12-19 18:01:38 +01:00
Laurent Destailleur
29b9fb6f54
Merge pull request #7964 from aspangaro/8.0-a1 
NEW : Add search on date and accounting account in various payment list
 2017-12-19 17:58:26 +01:00
Laurent Destailleur
016be9139b Fix sql request 2017-12-19 17:09:47 +01:00
Laurent Destailleur
731cb3f721 Fix editor of user signature 2017-12-19 17:00:40 +01:00
Laurent Destailleur
01c99b780e Fix missing index 2017-12-19 16:22:47 +01:00
Laurent Destailleur
f504716501 Fix sync contact - external user 2017-12-19 16:16:31 +01:00
Neil Orley
171e388f6d NEW Update bank account when updating an order 
Add the ability to update the bankaccount when updating an order
 2017-12-19 14:16:51 +01:00
Neil Orley
a3f4066790 NEW Update bank account when updating an invoice 
Add the ability to update the bankaccount when updating an invoice
 2017-12-19 14:14:26 +01:00
Neil Orley
7e3a2d75bb FIX Error when classify the order as invoiced unsing API 
Remove of notrigger parameter. The notrigger attribute caused a type error when used.
 2017-12-19 13:06:28 +01:00
Neil Orley
40aebfa081 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-19 12:54:38 +01:00
Laurent Destailleur
feaff433b8 Debug module website 2017-12-19 12:54:10 +01:00
Neil Orley
e90183f4ba NEW Update end of validity date of proposal using the API 
Add the ability to update the end of validity date when modifying a proposal
 2017-12-19 12:37:37 +01:00
Neil Orley
fe8fac9577 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-19 12:36:46 +01:00
Laurent Destailleur
89a62103ca Debug module website 2017-12-19 11:40:29 +01:00
Laurent Destailleur
fcf04c122f Fix phpcs 2017-12-19 00:39:01 +01:00
Laurent Destailleur
91932838ef Fix constant MAIN_LANG_DEFAULT not used 2017-12-19 00:24:38 +01:00
Laurent Destailleur
d4afb8300d Fix several pb of duplicate functions in some cases 2017-12-19 00:15:22 +01:00
Laurent Destailleur
2e87318b58 Fix sql error 2017-12-18 19:15:42 +01:00
Laurent Destailleur
2204790602 Fix filter on project id when id is list with comma 2017-12-18 19:04:57 +01:00
Neil Orley
0817873267 NEW Create an order using an existing proposal 
Create an order using an existing proposal.
 2017-12-18 16:13:54 +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
Neil Orley
d8dac909d6 NEW Add error message 
Returns the error message when the API can't add a new line in a proposal
 2017-12-18 14:36:41 +01:00
Neil Orley
ee6b0d7237 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-18 14:36:29 +01:00
Laurent Destailleur
98b82d712a NEW Revenue stamp can be a percent 
FIX Revenue stamp not visible on the transfer payment page
 2017-12-18 12:43:03 +01:00
Laurent Destailleur
8e12551f17 Fix not employee must not appear on page to create salaries 2017-12-18 11:55:34 +01:00
Laurent Destailleur
54db0d31b4 Fix GETPOST for intcomma 2017-12-18 11:32:24 +01:00
Laurent Destailleur
6f9822ddb3 Fix link for payment no set 2017-12-17 22:03:42 +01:00
Laurent Destailleur
713af7f6df Debug module website 2017-12-17 20:25:45 +01:00
Laurent Destailleur
d6fb3aecba Clean code 2017-12-17 16:26:34 +01:00
Laurent Destailleur
8d671b2b26 Debug website module 2017-12-17 16:24:47 +01:00