Commit Graph

59537 Commits

Author SHA1 Message Date
Laurent Destailleur
252335318f
Update pdf.lib.php 2018-09-04 09:57:01 +02:00
Laurent Destailleur
4a7bec2c04 Fix fax not required as visible by default on list 2018-09-04 09:48:30 +02:00
Laurent Destailleur
739c2822af Fix look and feel v8 2018-09-04 09:42:28 +02:00
Laurent Destailleur
cdc1e1fc76 Fix responsive 2018-09-04 09:37:51 +02:00
Laurent Destailleur
db6f80e2ff FIX invoice popup hide localtax2 and 3 if not defined 2018-09-04 00:42:15 +02:00
Laurent Destailleur
94c05fbd84 Look and feel v8 2018-09-04 00:29:31 +02:00
Laurent Destailleur
6ce37e588d Prepare 8.0.2 2018-09-04 00:22:14 +02:00
Laurent Destailleur
392f31abbd FIX invert mime type and name 2018-09-04 00:21:48 +02:00
Marc de Lima Lucio
e285b42a18 FIX: PDF address: handle when contact thirdparty different from document thirdparty 2018-09-03 17:57:30 +02:00
Laurent Destailleur
3d50c454c1 Code comment 2018-09-03 17:05:44 +02:00
Laurent Destailleur
47655f0725 Add comment as FIXME 2018-09-03 14:00:12 +02:00
Laurent Destailleur
d050c0654b FIX Add "-- ADD xxx to rowd" to avoid rowid conflict on account chart 2018-09-03 13:14:25 +02:00
Laurent Destailleur
6641a05744 Fix missing class 2018-09-03 11:59:19 +02:00
Laurent Destailleur
1249e597d4 Fix test param $id 2018-09-03 11:56:05 +02:00
Laurent Destailleur
76d6affb27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	.travis.yml
2018-09-02 15:46:09 +02:00
Laurent Destailleur
df26ae764e Fix typo 2018-09-01 17:56:52 +02:00
Laurent Destailleur
0bf967ab10 Fix setup 2018-09-01 17:50:13 +02:00
Laurent Destailleur
5f2eeb552a Fix setup of email 2018-09-01 17:48:35 +02:00
Laurent Destailleur
dfda029da4 FIX a removed option was still in setup 2018-09-01 17:44:07 +02:00
Laurent Destailleur
ada6d2c963 More logs 2018-09-01 17:27:14 +02:00
Laurent Destailleur
32baec1c9a Fix logs 2018-09-01 17:10:47 +02:00
Laurent Destailleur
c17233a409 More logs 2018-09-01 16:51:40 +02:00
Laurent Destailleur
fe7a0c894f
Merge pull request #9368 from atm-ph/fix_7.0_search_company_by_code
Fix search company by code
2018-09-01 14:42:32 +02:00
Laurent Destailleur
945e925399
Update html.form.class.php 2018-09-01 14:41:44 +02:00
Laurent Destailleur
26cff9e11f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/langs/en_US/blockedlog.lang
	htdocs/stripe/config.php
2018-09-01 14:13:01 +02:00
Laurent Destailleur
677d7dd0fb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-01 14:09:20 +02:00
Laurent Destailleur
123a66dc2a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/product/class/product.class.php
2018-09-01 14:09:00 +02:00
Laurent Destailleur
b6f4b1dff7
Merge pull request #9363 from frederic34/patch-21
Update modSociete.class.php
2018-09-01 13:31:23 +02:00
Frédéric FRANCE
2b5407c31d Update export.php 2018-09-01 13:30:28 +02:00
Laurent Destailleur
bb444c80d0
Merge pull request #9360 from frederic34/patch-18
Update ldap.php
2018-09-01 13:28:16 +02:00
Laurent Destailleur
1eeb567e67
Merge pull request #9359 from frederic34/patch-17
Update card.php
2018-09-01 13:27:49 +02:00
Laurent Destailleur
dee9442720 Fix regression 2018-09-01 13:12:09 +02:00
Josep Lluís
bfaf7ae473 Fix: undefined rights_class on modules
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
2018-09-01 12:44:16 +02:00
Josep Lluís
79ee31df5c Fix: undefined rights_class on modules
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
2018-09-01 12:43:02 +02:00
Laurent Destailleur
ae36469166 FIX #9337 2018-09-01 12:28:36 +02:00
Laurent Destailleur
160a35f63f
Merge pull request #9335 from frederic34/patch-11
Update blockedlog.lang
2018-09-01 12:19:36 +02:00
Laurent Destailleur
81c4e6a764 FIX Force stripe api version to avoid trouble if we update stripe api
Conflicts:
	htdocs/stripe/config.php
2018-09-01 12:03:44 +02:00
Laurent Destailleur
f0fc99ee4c FIX Force stripe api version to avoid trouble if we update stripe api 2018-09-01 12:01:01 +02:00
Laurent Destailleur
ca2e9f20f6 Fix missing extrafield table 2018-08-31 18:39:13 +02:00
Laurent Destailleur
6af8f8f475 Fix trans 2018-08-31 16:57:50 +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
atm-ph
102b698c76 Fix search company by code 2018-08-31 11:38:45 +02:00
Laurent Destailleur
07d5bd143a Fix entity 2018-08-31 11:26:53 +02:00
Laurent Destailleur
bdbe2c02ed Sample 2018-08-31 10:51:32 +02:00
Frédéric FRANCE
2eade6ea68
Update modSociete.class.php 2018-08-30 23:22:06 +02:00
Frédéric FRANCE
f61450ffa8
Update ldap.php 2018-08-30 23:04:32 +02:00
Frédéric FRANCE
9c44f80746
Update card.php 2018-08-30 23:03:03 +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
4d22c4f9f9 Typo 2018-08-30 11:37:06 +02:00
atm-greg
f8fef61075 remove useless db begin 2018-08-30 09:19:44 +02:00
Frédéric FRANCE
285e231ea1
Update blockedlog.lang 2018-08-29 23:08:13 +02:00
Laurent Destailleur
f146572b81 ident 2018-08-29 21:18:47 +02:00
ptibogxiv
eaa49e773d fix deletion of stripe customer 2018-08-29 21:13:45 +02:00
Laurent Destailleur
e2865ff75f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-29 21:13:10 +02:00
Laurent Destailleur
7211aff016
Update dispatch.php 2018-08-29 21:11:28 +02:00
Laurent Destailleur
a8bb55c66d
Merge branch '8.0' into 7.0_new_dispatch 2018-08-29 21:08:51 +02:00
Laurent Destailleur
6ca9854a34 Fix to avoid fetch when no accounting account defined 2018-08-29 21:07:00 +02:00
Laurent Destailleur
88044a3d75
Update dispatch.php 2018-08-29 20:42:19 +02:00
Laurent Destailleur
d40e1a0d0b FIX #9258 2018-08-29 20:12:38 +02:00
Laurent Destailleur
8b291b2053 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	README.md
2018-08-29 19:55:10 +02:00
Laurent Destailleur
46fe19bed5 Code comment 2018-08-29 18:56:57 +02:00
Laurent Destailleur
0c11007e34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	README.md
	htdocs/comm/propal/card.php
2018-08-29 18:53:39 +02:00
Laurent Destailleur
34ceec7067 FIX #9328 2018-08-29 18:40:12 +02:00
Laurent Destailleur
4e7e290624 FIX #9328 2018-08-29 18:38:58 +02:00
Laurent Destailleur
428354303c FIX #9328 2018-08-29 18:29:42 +02:00
Laurent Destailleur
d8bd76b8ce FIX #9328 2018-08-29 18:27:39 +02:00
Laurent Destailleur
275b9a9960
Merge pull request #9325 from frederic34/patch-12
Fix allow barcode with special char
2018-08-29 18:01:15 +02:00
ptibogxiv
b9179f27a0 Fix multicompany in ticket/list.php
Conflicts:
	htdocs/ticket/class/ticket.class.php
2018-08-29 17:55:55 +02:00
Laurent Destailleur
7bf48b8d77 Fix date_start and date_end not saved on supplier invoice
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
2018-08-29 17:26:41 +02:00
Laurent Destailleur
74b3e3e814 Fix for compatibility with lines with no prices (some external modules) 2018-08-29 14:50:12 +02:00
atm-quentin
76cb9f60c7 NEW hook on dispatch order fourn 2018-08-29 14:26:04 +02:00
Frédéric FRANCE
24be0b7305
Update viewimage.php
code may have rich content (qrcode, datamatrix,...)
2018-08-29 13:08:52 +02:00
Laurent Destailleur
1b542d5be3 Fix translation 2018-08-28 18:36:46 +02:00
Laurent Destailleur
b5c2383f65 Fix type of invoice encoded twice 2018-08-28 18:34:53 +02:00
Laurent Destailleur
d2d28ab109 Fix trans 2018-08-28 18:28:09 +02:00
Laurent Destailleur
bc31fa7fbf Fix translation 2018-08-28 18:18:04 +02:00
gauthier
61a57e619f FIX : $fk_account is always empty, must be $soc->fk_account 2018-08-28 16:54:04 +02:00
Laurent Destailleur
bbc6255925 Fix missing language 2018-08-28 13:07:48 +02:00
Laurent Destailleur
b875abb27b Fix logo on public page of survey 2018-08-28 03:03:05 +02:00
Laurent Destailleur
2349f99eb9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 02:58:51 +02:00
Laurent Destailleur
7df5993ee0 Fix logo in public survey page 2018-08-28 02:58:14 +02:00
Laurent Destailleur
32ef9695a7
Merge pull request #9282 from frederic34/patch-19
Update card.php
2018-08-28 02:28:35 +02:00
Laurent Destailleur
7462a1ae1d
Update card.php 2018-08-28 02:27:56 +02:00
Laurent Destailleur
0a7ce338f9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
2018-08-28 02:23:34 +02:00
Laurent Destailleur
4369be7b39
Merge pull request #9284 from frederic34/patch-20
Update commondocgenerator.class.php
2018-08-28 02:11:50 +02:00
Laurent Destailleur
d90eed3098
Merge pull request #9291 from frederic34/patch-23
typo
2018-08-28 01:55:44 +02:00
Laurent Destailleur
0d138b8fc0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 01:43:35 +02:00
Laurent Destailleur
b4652ea24b
Merge pull request #9292 from frederic34/patch-24
Create index.html
2018-08-28 01:37:48 +02:00
Laurent Destailleur
1f807b9216
Merge pull request #9305 from atm-gauthier/7.0_fix_altertable_charges
FIX : table llx_chargessociales doesn't exists
2018-08-28 01:37:31 +02:00
Laurent Destailleur
ad0cc098ee Fix alter forgot 2018-08-28 01:37:25 +02:00
Laurent Destailleur
534eadb7a2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 01:35:43 +02:00
ptibogxiv
6556ace2bc Fix sync user->member
add more fields
2018-08-28 01:35:05 +02:00
ptibogxiv
ca8a22a3ad fix sync user/member
add more fields to sync
2018-08-28 01:35:01 +02:00
Frédéric FRANCE
faa29f9ae0 Update antivir.class.php 2018-08-28 01:34:42 +02:00
Norbert Penel
f9c1dd8edd There is a begin transaction without rollback
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
2018-08-28 01:32:55 +02:00
Laurent Destailleur
751fc512af
Merge pull request #9301 from frederic34/patch-26
FIX sql error
2018-08-28 01:30:25 +02:00
Laurent Destailleur
e00d6eda7e
Update productlot_list.php 2018-08-28 01:29:33 +02:00
Laurent Destailleur
0300991389 Fix trans 2018-08-27 23:42:47 +02:00
Laurent Destailleur
90c3f8afce Fix trans 2018-08-27 23:39:11 +02:00
Laurent Destailleur
d2154e72c0 Fix trans 2018-08-27 23:23:49 +02:00
gauthier
79aa390fe8 FIX : table llx_chargessociales doesn't exists 2018-08-27 15:07:19 +02:00
Laurent Destailleur
8cacda1c1e Fix error message 2018-08-27 14:45:20 +02:00
atm-ph
d9beb3f882 Fix tms missing in fetch propal 2018-08-27 10:19:07 +02:00
atm-ph
eb4e42bc40 Fix datec and tms missing in fetch method for API 2018-08-26 18:08:10 +02:00
Frédéric FRANCE
27978ed9a0
Update productlot_list.php
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/62492-dolibarr-8-erreur-sql-avec-le-menu-lots-series
2018-08-26 07:47:33 +02:00
Laurent Destailleur
79aa0bbd1c Fix duplicate load 2018-08-24 12:28:44 +02:00
Laurent Destailleur
a153b2f121 Fix bad link 2018-08-24 11:54:04 +02:00
Laurent Destailleur
085f8cf604 Fix bad link 2018-08-24 11:51:06 +02:00
Laurent Destailleur
89d55f3b46 Fix lib in modulebuilder 2018-08-24 11:45:22 +02:00
Laurent Destailleur
a82d86cec4 FIX warning for late template invoices to remove when suspended 2018-08-24 10:46:47 +02:00
Frédéric FRANCE
85ae8f3901
Update card.php 2018-08-24 09:29:17 +02:00
Laurent Destailleur
64427dafb6 Fix back to page when canceling an edit in the module template 2018-08-23 20:21:27 +02:00
Laurent Destailleur
781a55429a FIX API template to delete a record 2018-08-23 20:03:41 +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
Laurent Destailleur
62b2981e42 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-23 19:47:31 +02:00
Laurent Destailleur
019ff534a0 FIX api template for list in module builder 2018-08-23 19:46:08 +02:00
Laurent Destailleur
8757392e6b FIX remove internal property isextrafieldmanaged from API returns 2018-08-23 19:24:00 +02:00
Laurent Destailleur
e6acacee4b Fix cleandata method of modulebuilder template of AAPI 2018-08-23 19:19:25 +02:00
Laurent Destailleur
e2e09f8534 Fix hookmanager var 2018-08-23 17:56:16 +02:00
Laurent Destailleur
61ced8220b Fix sample doc 2018-08-23 17:49:14 +02:00
Frédéric FRANCE
58d339597b
Create index.html 2018-08-23 15:44:33 +02:00
Frédéric FRANCE
343e6ce8b3
typo 2018-08-23 14:34:27 +02:00
Frédéric FRANCE
96f16b7497
Update commondocgenerator.class.php 2018-08-22 17:29:05 +02:00
Frédéric FRANCE
0334409d18
Update card.php 2018-08-22 13:43:30 +02:00
Laurent Destailleur
b650f7ac17 Fix tab 2018-08-22 13:37:18 +02:00
Laurent Destailleur
de2cdfc70f FIX Language selection lost if error during creation of email template 2018-08-22 13:23:46 +02:00
Laurent Destailleur
c7a241a5db FIX Get templates in a forced language
Conflicts:
	htdocs/core/class/html.formmail.class.php
2018-08-22 13:22:49 +02:00
Laurent Destailleur
c20d556265 FIX Get templates in a forced language 2018-08-22 13:16:55 +02:00
Laurent Destailleur
cd09052e80 FIX badge on time spent on project and tasks 2018-08-21 14:52:22 +02:00
Laurent Destailleur
3cfc47a732 Fix urls in project module 2018-08-21 14:41:59 +02:00
Laurent Destailleur
b86d54cab3 Trad 2018-08-21 14:05:53 +02:00
Laurent Destailleur
9dbb0eaab0 Fix cron task label 2018-08-21 14:01:03 +02:00
Laurent Destailleur
243cbbc11d Fix missing trans 2018-08-21 13:58:24 +02:00
Laurent Destailleur
4fdd521d61
Merge pull request #8671 from ATM-Nicolas/fix_comments_on_tasks
FIX : Fetch task will now fetch comments
2018-08-21 13:36:20 +02:00
Laurent Destailleur
009424cd67
Merge pull request #9226 from atm-greg/Fix_project_delete_tasks
Fix project delete tasks
2018-08-21 13:11:00 +02:00
Laurent Destailleur
91bfa4be6c
Update project.class.php 2018-08-21 13:10:20 +02:00
Laurent Destailleur
3523c2b3d2
Update project.class.php 2018-08-21 13:09:06 +02:00
Frédéric FRANCE
fb3754af59 Update fichinter.class.php 2018-08-21 12:54:25 +02:00
Frédéric FRANCE
9a5f839e63 Update actions_printing.inc.php 2018-08-21 12:54:02 +02:00
Laurent Destailleur
8032c314d4
Merge pull request #9252 from bugness-chl/8.0-2
FIX adding GROUP BY for PostgreSQL
2018-08-21 12:51:56 +02:00
Laurent Destailleur
cd7c46794a
Merge pull request #9260 from frederic34/patch-19
FIX propal.class.php
2018-08-21 12:49:25 +02:00
Laurent Destailleur
27e2810e10 Fix date format 2018-08-20 17:14:03 +02:00
Laurent Destailleur
795b2f3d58 FIX Delete file on smartphone 2018-08-19 03:00:11 +02:00
Laurent Destailleur
547a0aaac7 FIX Look and feel v8 2018-08-19 02:43:45 +02:00
Laurent Destailleur
116f4a1a09 Fix responsive 2018-08-19 02:22:12 +02:00
Laurent Destailleur
cca0f4bf22 Fix translation 2018-08-19 02:01:18 +02:00
Laurent Destailleur
38f3452f0c Fix trans 2018-08-19 01:51:45 +02:00
Laurent Destailleur
dedfd6d493 Fix missing translation 2018-08-18 02:55:22 +02:00
Frédéric FRANCE
71d3af8b07
Update propal.class.php 2018-08-17 13:44:07 +02:00