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

60032 Commits

Author SHA1 Message Date
ptibogxiv
d36dda37e6
Fix metadata for charge.php 
Fix for dol_id, dol_type
 2018-10-04 10:56:29 +02:00
ATM-Nicolas
c048f51562 FIX : Wrong variable name 2018-10-04 09:54:40 +02:00
florian HENRY
e95921eb93 better test 2018-10-04 09:47:04 +02:00
florian HENRY
7f4f27ebfe indent 2018-10-04 09:45:12 +02:00
florian HENRY
292dab192b FIX : #9161 2018-10-04 09:42:11 +02:00
atm-ph
2acd69033c Fix minor error in dom 2018-10-03 22:48:29 +02:00
florian HENRY
b8c88a2144 rename var 2018-10-03 15:43:00 +02:00
florian HENRY
1b18781299 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0 2018-10-03 15:41:10 +02:00
florian HENRY
ef7ed97866 fix ressource list with extrafields 2018-10-03 15:40:58 +02:00
aplose
8ee7a48583 Fix issue #9434 : no array_options available when calling api : 
I replace the deprecated code by the fetch_optionnals() recommanded call.
 2018-10-03 15:15:46 +02:00
atm-greg
583ea05567 fix missing letter... 2018-10-03 12:13:53 +02:00
gauthier
587766b39b FIX : wrong function name 2018-10-03 10:38:47 +02:00
Laurent Destailleur
e83149a344 Fix deletion of credit card when no Oauth set 2018-10-02 22:35:51 +02:00
Ferran Marcet
d66b2322c2 FIX Can't create shipping if have shipping line's extrafields 2018-10-02 09:37:44 +02:00
Laurent Destailleur
75b1cac33f FIX Pagination stats 2018-10-01 01:15:19 +02:00
Alexandre SPANGARO
14627abb27 FIX Title problem on admin RSS module 2018-10-01 01:14:43 +02:00
Laurent Destailleur
c07ab81e6a Fix trans 2018-09-28 02:22:23 +02:00
Philippe
06fe172669 FIX Product marge tabs on product card 
Credit note are not negative so the grand total are false
 2018-09-27 20:06:00 +02:00
Philippe
8deb2eaa0c Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0 2018-09-27 19:00:09 +02:00
Laurent Destailleur
575c63f87d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2018-09-27 12:52:10 +02:00
Laurent Destailleur
6e7fd15e1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-27 12:48:08 +02:00
Laurent Destailleur
291d477f65 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-27 12:47:48 +02:00
Laurent Destailleur
7b86776f6b Introduce option MAIN_INCLUDE_ZERO_VAT_IN_REPORTS to solve a regression 
on feature to report vat by rate when rate is zero
 2018-09-27 12:42:52 +02:00
Laurent Destailleur
96c1814793 FIX XSS vulnerability reported by Mary Princy E 2018-09-27 11:33:28 +02:00
Laurent Destailleur
4c8664b297
Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns 
FIX: showOptionals: column mismatches
 2018-09-27 09:39:51 +02:00
Carsten Brandt
fee46ac845 Update german accounting file to use rowid 
- fix "TODO Fix this file to use rowid"
 2018-09-27 09:39:00 +02:00
Laurent Destailleur
2d88b69cf6
Merge pull request #9616 from frederic34/patch-14 
add try catch for swiftmailer
 2018-09-27 09:34:21 +02:00
Laurent Destailleur
bc5b794b1a
Merge pull request #9613 from frederic34/patch-11 
FIX Option MAIN_DISABLE_NOTES_TAB #9611
 2018-09-27 09:30:56 +02:00
Laurent Destailleur
ee8b5030a0
Merge pull request #9610 from atm-john/FIX_situation_credit_note 
Fix situation credit note
 2018-09-27 09:26:23 +02:00
Laurent Destailleur
e3b1cb9fdb
Update facture.class.php 2018-09-27 09:25:37 +02:00
Laurent Destailleur
ff3f1e933a
Update replenish.php 2018-09-27 09:22:38 +02:00
Laurent Destailleur
e72dc26532
Merge pull request #9603 from atm-john/Fix_situation_invoice_selection 
FIX previous situation invoice selection
 2018-09-27 09:20:24 +02:00
Laurent Destailleur
2b8ccc0c81 FIX Link template invoice to contract 2018-09-27 01:53:12 +02:00
Marc de Lima Lucio
af93fc7484 FIX: showOptionals: column mismatches 2018-09-26 17:19:06 +02:00
Frédéric FRANCE
1bac3a0ccf
swiftmailer is doing encodetorfc2822 2018-09-26 10:37:20 +02:00
Frédéric FRANCE
92a3faeaf7
add try catch for swiftmailer 2018-09-26 10:13:14 +02:00
Frédéric FRANCE
a9f7bdead6
fix Option MAIN_DISABLE_NOTES_TAB #9611 2018-09-25 15:22:08 +02:00
Laurent Destailleur
e39e54503e Fix responsive 2018-09-25 12:54:24 +02:00
Laurent Destailleur
515acbfee2 FIX Bad position of hook formattachOptions call 2018-09-25 11:46:42 +02:00
John BOTELLA
022f842cb0 Fix display good progress for new situation invoices 2018-09-25 10:28:47 +02:00
John BOTELLA
791c373db5 FIX credit note progression 2018-09-25 09:54:58 +02:00
Frédéric FRANCE
d15c52db3b
Update rssparser.class.php 2018-09-25 08:16:05 +02:00
Laurent Destailleur
df64961c6b FIX nb of session in title 2018-09-24 21:56:57 +02:00
gauthier
fc7c0ce521 FIX : need to filter on current entity on replenish 2018-09-24 16:23:44 +02:00
John BOTELLA
b1380a6902 FIX situation invoice total with credit note 2018-09-24 16:12:00 +02:00
Laurent Destailleur
26d585ffbe Use latest instead of last 2018-09-24 10:43:01 +02:00
Laurent Destailleur
57e359cd40 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:18:13 +02:00
John BOTELLA
ceccd5a510 Fix prev situation invoice selection 2018-09-24 10:16:28 +02:00
Laurent Destailleur
40bed96a01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-24 10:15:20 +02:00
Laurent Destailleur
dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:14:38 +02:00
Laurent Destailleur
2dbb82fc76 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-09-24 10:03:21 +02:00
Laurent Destailleur
12690666e2 Missing trans 2018-09-24 10:03:08 +02:00
Laurent Destailleur
39e9029e41
Update contact.class.php 2018-09-23 15:44:44 +02:00
Laurent Destailleur
9ddc1770e8
Merge pull request #9501 from atm-gauthier/7.0_fix_tva_if_buyer_hors_cee_and_particulier 
FIX : According to french law, if seller is in France and buyer isn't…
 2018-09-23 15:41:33 +02:00
Laurent Destailleur
1569770855
Rename hidden conf into MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC 2018-09-23 15:41:22 +02:00
ptibogxiv
77dd516023
fix number mailing for a contact / multicompany 2018-09-22 14:45:15 +02:00
gauthier
7b46bedce6 NEW : hidden configuration 2018-09-21 14:35:36 +02:00
Laurent Destailleur
7a422c9d24
Merge pull request #9578 from fmarcet/8.0 
FIX #9432 Assign yourself as a commercial when you don't have permission to see all thirds
 2018-09-21 11:30:38 +02:00
Ferran Marcet
d6d58b1f68 FIX #9432 2018-09-21 10:18:54 +02:00
Ferran Marcet
1a7b38f22a FIX #9432 2018-09-21 10:14:23 +02:00
Laurent Destailleur
a0bc26a923
Merge pull request #9476 from atm-maxime/fix_invoicelist_creditnote 
Fix invoicelist creditnote
 2018-09-21 09:56:43 +02:00
Laurent Destailleur
eb80c5c338 Fix translation not loaded and test on multicompany 2018-09-20 19:45:13 +02:00
Laurent Destailleur
4ba057528f Fix permissionss 2018-09-20 19:37:28 +02:00
Laurent Destailleur
b421c29ea7 FIX #9510 2018-09-20 19:20:15 +02:00
Laurent Destailleur
df395847d3 FIX #9567 2018-09-20 19:14:32 +02:00
Laurent Destailleur
9fc08c45cf
Merge pull request #9575 from atm-maxime/new_phpunit_loan 
NEW PHPUnitTest on Loan class #3163
 2018-09-20 19:00:26 +02:00
Ferran Marcet
4597cd44e5 FIX #9432 2018-09-20 17:52:44 +02:00
Laurent Destailleur
e0dfab4c71 FIX The max size for upload file was not corectly shown 2018-09-20 16:21:36 +02:00
Maxime Kohlhaas
75104999d3 NEW PHPUnitTest on Loan class #3163 2018-09-20 15:04:00 +02:00
Laurent Destailleur
55e3d97842 Trans 2018-09-19 17:56:51 +02:00
Laurent Destailleur
824b572bd0 FIX Amount when using mutlicurrency on PDF 
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2018-09-19 15:03:24 +02:00
Laurent Destailleur
9b190d2cbc
Merge pull request #9201 from atm-quentin/FIX_select_element 
FIX exclude element of the select
 2018-09-19 14:55:31 +02:00
gauthier
d62118dca8 FIX : langs fr 2018-09-19 14:53:56 +02:00
Laurent Destailleur
dc7c27b162 Release 8.0.2 2018-09-19 14:53:39 +02:00
Laurent Destailleur
02617bd799 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-19 14:53:07 +02:00
Laurent Destailleur
2b67da3f34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-09-19 14:52:43 +02:00
Frédéric FRANCE
1d43c6bc3a
call to deprecated add_object_linked was present two times 2018-09-19 10:57:59 +02:00
Frédéric FRANCE
cdbb79a26c
correct typo in multicurrency doc pdf 2018-09-19 09:26:56 +02:00
Laurent Destailleur
85180b117c Fix warnings 2018-09-18 23:48:02 +02:00
Laurent Destailleur
c56b02c1c4 Fix warning 2018-09-18 23:47:55 +02:00
Laurent Destailleur
79b248fc67 FIX warning picto when next run date passed 2018-09-18 23:27:26 +02:00
Laurent Destailleur
014da6c22c Fix translation 2018-09-18 18:11:07 +02:00
Laurent Destailleur
99d214abd5 Fix family of module Payment of employee salaries 2018-09-18 16:38:51 +02:00
Laurent Destailleur
4580ed0b09 Fix bad link 2018-09-18 15:31:25 +02:00
Laurent Destailleur
85bed00474 Fix default fields 2018-09-18 11:50:04 +02:00
Laurent Destailleur
2d8eb034e3 FIX Maxi debug to allow to load chart of account with multicompany 2018-09-17 21:02:07 +02:00
Laurent Destailleur
1e36aba35f Trans 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-09-17 16:42:44 +02:00
Laurent Destailleur
3fc3cc4688 Fix missing email in popup 2018-09-17 14:17:10 +02:00
Laurent Destailleur
f3ce7cb5a5 Quick hack to provide help to fix pb of undesirable files 2018-09-17 10:40:42 +02:00
Laurent Destailleur
f3f18bf8cb Fix sql 2018-09-17 02:23:11 +02:00
Laurent Destailleur
055a0b2859 Merge branch '8.0' of github.com:Dolibarr/dolibarr into 8.0 2018-09-16 13:29:13 +02:00
Laurent Destailleur
79b15b81f2 Fix list of tasks on time consumed 2018-09-16 13:28:37 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-16 12:54:39 +02:00
Laurent Destailleur
d06785e91a Fix responsive 2018-09-16 12:48:36 +02:00
Laurent Destailleur
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Laurent Destailleur
4151ca49eb Fix position of menu 2018-09-16 12:15:33 +02:00
Laurent Destailleur
a0bcf999c5 FIX #9043 2018-09-16 09:45:33 +02:00
Laurent Destailleur
a6d4185d6b FIX #9043 2018-09-16 09:44:52 +02:00
Laurent Destailleur
55e7989552 FIX #9043 2018-09-16 09:42:30 +02:00
Laurent Destailleur
2c8064967b Code comment 2018-09-16 09:31:06 +02:00
Laurent Destailleur
272944983c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-16 09:27:54 +02:00
Laurent Destailleur
34b75828d3 Work on fix for #9043 2018-09-16 09:27:36 +02:00
Laurent Destailleur
ecfbe0a568
Merge pull request #9499 from tarrsalah/fix-show-default-vat-rate 
FIX #9497
 2018-09-15 17:14:05 +02:00
Laurent Destailleur
56b0a5f1ed FIX Mixing tickets of different thirdparties 2018-09-14 13:07:27 +02:00
Laurent Destailleur
16ed582124 Add comment 2018-09-14 01:45:03 +02:00
gauthier
7838b75ec9 FIX : wrong var name 2018-09-13 16:11:42 +02:00
gauthier
b68523b9c1 FIX : According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product 2018-09-13 14:37:12 +02:00
tarrsalah
08453a5337 FIX #9497 
Extract $defaultcode and $defaulttxt from the value returned by
get_default_tva function .
 2018-09-13 11:04:11 +01:00
Laurent Destailleur
c5e30b61c0 Fix translation 2018-09-12 21:25:14 +02:00
Laurent Destailleur
3dca02d25b Fix translation 2018-09-12 21:07:34 +02:00
Laurent Destailleur
b7eeaa952c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-12 19:41:02 +02:00
Laurent Destailleur
72f359fdc7 Revert "add capture option in payment function" 
This reverts commit 849b7154a7.
 2018-09-12 19:40:43 +02:00
Laurent Destailleur
163bc55e4a
Merge pull request #9468 from jmarsac/numericextrafields9464 
Convert localized numeric extrafields value before inserting/updating
 2018-09-12 19:06:43 +02:00
ias-ceo
fece67b629 use correct resultset 2018-09-12 19:00:19 +02:00
Laurent Destailleur
23096354e0
Merge pull request #9463 from ptibogxiv/patch-57 
add capture option in payment function
 2018-09-12 18:38:10 +02:00
Laurent Destailleur
58ba1c3496
Merge pull request #9451 from hregis/7.0_price 
FIX better compatibility with multicompany
 2018-09-12 18:27:50 +02:00
Laurent Destailleur
e3a00c5dcd
Merge pull request #9450 from frederic34/patch-15 
Update accountancycategory.class.php
 2018-09-12 18:25:54 +02:00
Laurent Destailleur
88e76b6127
Revert "V8 style" 2018-09-12 18:19:12 +02:00
Laurent Destailleur
71e8d4c728
Merge pull request #9453 from ptibogxiv/patch-56 
V8 style
 2018-09-12 18:18:45 +02:00
Laurent Destailleur
1ad8a3e190
Merge pull request #9466 from ptibogxiv/patch-58 
Fix status display in transaction.php
 2018-09-12 18:14:46 +02:00
Laurent Destailleur
b341cb9245 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2018-09-12 18:11:51 +02:00
Laurent Destailleur
a3968b86df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-12 18:05:47 +02:00
Laurent Destailleur
3662ebe3a3 Fix syntax error 2018-09-12 18:05:20 +02:00
Laurent Destailleur
eb242d58f2
Merge pull request #9469 from atm-ph/fix_7.0_classname_colht 
Fix classname liencolht to linecolht
 2018-09-12 17:30:36 +02:00
Laurent Destailleur
77d7c97750 Fix typo 2018-09-12 17:18:27 +02:00
Laurent Destailleur
fd93a22dca Fix missing field 2018-09-12 16:45:12 +02:00
Laurent Destailleur
48ae4de47b FIX Add paypal error message in alert email 2018-09-12 16:11:10 +02:00
Laurent Destailleur
9cbba2dc7d Add log 2018-09-12 15:28:59 +02:00
Laurent Destailleur
50478b1bd4 FIX capital must be empty and not 0 if undefined 2018-09-12 15:21:11 +02:00
Laurent Destailleur
729d03862f Fix warning 2018-09-12 15:02:59 +02:00
Laurent Destailleur
5bd2c01411 Fix email missing in tooltip 2018-09-12 14:43:05 +02:00
Laurent Destailleur
53da80a79f FIX Missing translation in predefined email to membership renewal 2018-09-12 12:55:10 +02:00
Maxime Kohlhaas
c94689e9a9 FIX remain to pay for credit note was wrong on invoice list 2018-09-12 11:53:57 +02:00
Laurent Destailleur
aad6a0871f FIX Lose filter on payment type or category after a sort on invoice list 
Conflicts:
	htdocs/compta/facture/list.php
 2018-09-12 10:59:53 +02:00
Laurent Destailleur
7bea9f5ffb FIX Lose filter on payment type or category after a sort on invoice list 2018-09-12 10:57:09 +02:00
Jean-Marie Arsac
345c24990e Correction of variable name 2018-09-11 20:51:54 +02:00
atm-ph
40c79cb7cd Fix classname liencolht to linecolht 2018-09-11 17:56:11 +02:00
Jean-Marie Arsac
2f2dff8155 Convert localized numeric extrafields value before inserting 
- add 'double' case in insertExtraFields and updateExtraFields to to convert localized value using price2num()
 2018-09-11 14:57:31 +02:00
ptibogxiv
7f3f0f3643
Fix status display in transaction.php 2018-09-11 12:10:48 +02:00
ptibogxiv
849b7154a7
add capture option in payment function 2018-09-11 10:59:25 +02:00
Laurent Destailleur
d011204624 Fix switch of extrafields between all and only one entity 2018-09-10 17:36:46 +02:00
ptibogxiv
ccc415204e
V8 style 2018-09-10 16:46:16 +02:00
Regis Houssin
43ac51b44c FIX remove debug 2018-09-10 10:11:07 +02:00
Regis Houssin
8699866062 FIX better compatibility with multicompany 2018-09-10 10:08:04 +02:00
Laurent Destailleur
20fa294ff1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-10 01:22:16 +02:00
Laurent Destailleur
15aa99fc8e Fix css 2018-09-10 01:22:01 +02:00
Frédéric FRANCE
d8f77f040f
Update accountancycategory.class.php 2018-09-09 23:12:16 +02:00
Frédéric FRANCE
9d8a4e463b
Update accountancycategory.class.php 2018-09-09 23:09:52 +02:00
Laurent Destailleur
bcfb5fc42e
Merge pull request #9425 from atm-maxime/8.0 
FIX : Homepage links were using wrong topmenus
 2018-09-07 19:35:10 +02:00
Laurent Destailleur
e2df3fd4ad
Merge pull request #9423 from ptibogxiv/patch-55 
Fix error when delete stripe customer
 2018-09-07 19:34:45 +02:00
Laurent Destailleur
7c5ceff569 Fix search on project 2018-09-07 15:01:34 +02:00
Laurent Destailleur
0ef17fe581 FIX Problems with permissions of module to record payment of salaries 2018-09-07 13:32:56 +02:00
Laurent Destailleur
ff05997f0a FIX Several fixes on the management of minimal amount for orders 2018-09-06 17:37:02 +02:00
Maxime Kohlhaas
a5f4a74ecc FIX : Homepage links were using wrong topmenus 2018-09-06 14:49:48 +02:00
Philippe GRAND
9025fd5891 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2018-09-06 14:33:46 +02:00
Philippe GRAND
844333688b typo 2018-09-06 14:33:22 +02:00
ptibogxiv
da4e902645
Fix error when delete stripe customer 2018-09-06 11:35:19 +02:00
Laurent Destailleur
b25a0ca672 Fix no need of thumb when upload image for email 2018-09-05 23:25:17 +02:00
Laurent Destailleur
ed31eec5ee Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-05 20:40:19 +02:00
Laurent Destailleur
dfea391c88 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-09-05 20:39:38 +02:00
Laurent Destailleur
e3339f5f95 Fix trad 2018-09-05 19:01:00 +02:00
Laurent Destailleur
0bd4bc39dd Fix responsive 2018-09-05 16:03:43 +02:00
Laurent Destailleur
3650dc3ec9 FIX #8452 2018-09-05 15:25:47 +02:00
Laurent Destailleur
f1cb13634b FIX Entering negative price on order 2018-09-05 14:55:45 +02:00
Laurent Destailleur
19431a94ba Code style 2018-09-05 14:37:44 +02:00
Laurent Destailleur
1882043f19 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-05 14:26:24 +02:00
Laurent Destailleur
51901108ad FIX #9412 2018-09-05 14:26:12 +02:00
Laurent Destailleur
f7d5172a74
Merge pull request #9410 from frederic34/patch-10 
Create index.html
 2018-09-05 14:15:22 +02:00
Ferran Marcet
57be6a752e Fix: Expedition not showing extrafields on creation 2018-09-05 10:00:33 +02:00
Frédéric FRANCE
2015268b7e
Create index.html 2018-09-04 22:06:24 +02:00
Frédéric FRANCE
e4afd4af00
Create index.html 2018-09-04 22:05:06 +02:00
Laurent Destailleur
aec0d4022b Fix responsive 2018-09-04 19:59:20 +02:00
Laurent Destailleur
154e44e761 Fix responsive 2018-09-04 19:57:20 +02:00
Laurent Destailleur
203c925c5b Fix look and feel v8 2018-09-04 12:03:21 +02:00
Laurent Destailleur
8c2eac4c93 FIX #9317 2018-09-04 11:34:23 +02:00
Laurent Destailleur
9042d341f0 FIX #9316 Error when listing invoices 2018-09-04 11:19:31 +02:00
Laurent Destailleur
e7d2bcc34c FIX #9316 Error when listing invoices 2018-09-04 11:17:08 +02:00
Laurent Destailleur
f2ec94e9fd FIX #9353 Bug: html error - div inside span on graphs 2018-09-04 11:13:54 +02:00
Laurent Destailleur
76703972ed FIX #9355 2018-09-04 10:53:42 +02:00
Laurent Destailleur
9697bdf3b0 FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES 2018-09-04 10:38:09 +02:00
Laurent Destailleur
15b3fa73f4 FIX #9394 2018-09-04 10:16:16 +02:00
Laurent Destailleur
6b3ccddb65 FIX #9396 2018-09-04 10:14:45 +02:00
Laurent Destailleur
c59b0f95e6 FIX #9403 2018-09-04 10:10:47 +02:00
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-quentin
ec9eeb5201 FIX check !empty exclude select element 2018-08-27 10:17:18 +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
Cédric
fe6779c223
Erreur de syntaxe ( + au lieu de . ) 2018-08-16 17:20:38 +02:00
Laurent Destailleur
4c52384609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-16 14:48:42 +02:00
Laurent Destailleur
0c654bd452 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-16 14:47:56 +02:00
Laurent Destailleur
1b1258b2ef Fix url in tooltip 2018-08-16 11:19:22 +02:00
Laurent Destailleur
9f5cc2d05f Fix menu entry 2018-08-16 10:33:20 +02:00
Laurent Destailleur
1922c3d881 Fix menu entry 2018-08-16 10:32:42 +02:00
Chl
9e8485c279 FIX adding GROUP BY for PostgreSQL 2018-08-16 01:14:42 +02:00
Laurent Destailleur
2719c4eb43 Fix escape 2018-08-16 01:01:38 +02:00
Laurent Destailleur
4b7889b295 Fix left join broken 2018-08-16 01:00:38 +02:00
Laurent Destailleur
7d6e25789c Fix popup customer 2018-08-15 15:07:23 +02:00
Laurent Destailleur
15144a2473 Prepare 8.0.1 2018-08-15 14:42:34 +02:00
Laurent Destailleur
5a1a6ac095 Fix error message 2018-08-15 14:42:03 +02:00
Laurent Destailleur
37ca3ff230 Fix separator 2018-08-14 20:51:24 +02:00
florian HENRY
20309665e6 fix : ODT project substitution 2018-08-14 10:45:08 +02:00
atm-greg
ba6f7d4b0a fix infinite loop 2018-08-14 09:32:43 +02:00
delcroix Patrick
3b9266060c Fix #9205 quote in Label/number on supplier payment 
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
 2018-08-13 23:42:18 +02:00
Laurent Destailleur
577d2d728c
Merge pull request #9238 from ptibogxiv/patch-35 
Fix dolibarr_set_const
 2018-08-13 23:39:42 +02:00
Laurent Destailleur
2cbbb6e622 Prepare 8.0.0 release 2018-08-13 23:04:58 +02:00
Laurent Destailleur
33f0172603 Fix select zip/town 2018-08-13 16:44:49 +02:00
Laurent Destailleur
f96dd391fa Fix error in foreign key pointing to old table 2018-08-13 16:11:23 +02:00
Laurent Destailleur
df57bd176b Fix translation 2018-08-13 14:53:04 +02:00
ptibogxiv
d0666a9583
Fix incorrect entity 2018-08-13 14:34:54 +02:00
Laurent Destailleur
b977c3a9f5 Fix translation 2018-08-13 14:04:10 +02:00
ptibogxiv
c6adeabb55
Fix dolibarr_set_const 2018-08-13 12:22:51 +02:00
Laurent Destailleur
d92096f74a Fix menu payment not required if only module bank on 2018-08-13 02:04:38 +02:00
Laurent Destailleur
31c42c9a32 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/societe/canvas/actions_card_common.class.php
 2018-08-13 01:23:03 +02:00
Laurent Destailleur
21555a7435 Fix firstname/lastname 2018-08-13 01:10:51 +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
Laurent Destailleur
61a5be6e2a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-12 19:19:21 +02:00
Laurent Destailleur
234b0d3120
Merge pull request #9230 from ATM-Nicolas/fix_withdraw_pagination 
FIX : Pagination on withdraw request list
 2018-08-12 19:18:57 +02:00
Laurent Destailleur
b81b6b651f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-12 19:17:26 +02:00
Jan
ddbfaf0788 wrong position of counter reset 
extrafields will work now ;) and not the first product gets the last extrafields values
 2018-08-12 19:16:49 +02:00
Laurent Destailleur
b11d5c2f71
Merge pull request #9228 from atm-florian/8.0 
fix : remove comment on commit
 2018-08-12 19:13:07 +02:00
Laurent Destailleur
be7a764de7
Merge pull request #9202 from atm-florian/7.0 
fix bad use of test_sql_and_script_inject return int not value tested
 2018-08-12 18:24:54 +02:00
Laurent Destailleur
56d8935976
Merge pull request #9181 from ATM-Nicolas/fix_dolGetFirstLastname 
FIX : Wrong position of firstname lastname
 2018-08-12 18:11:36 +02:00
Laurent Destailleur
6954ab00f9
Update functions.lib.php 2018-08-12 18:11:27 +02:00
Laurent Destailleur
8d03d58d54
Merge pull request #9209 from ptibogxiv/patch-34 
Fix 3D secure
 2018-08-12 17:42:42 +02:00
Laurent Destailleur
3d4d42462c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-12 16:30:21 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
gauthier
391230babc FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281) 2018-08-10 15:39:49 +02:00
ATM-Nicolas
d8d54d246c FIX : Pagination on withdraw request list 2018-08-10 15:05:21 +02:00
Laurent Destailleur
39f4eae07e Fix look and feel v8 2018-08-09 23:11:49 +02:00
Laurent Destailleur
1af9700a58 Fix responsive 2018-08-09 22:52:43 +02:00
Laurent Destailleur
2dbb6e258b FIX Can filter on month in export of blockedlog 
FIX Fingerprint correct in popup
 2018-08-09 22:29:02 +02:00
florian HENRY
f0a32a2dea fix : remove comment on commit 2018-08-09 20:41:15 +02:00
Laurent Destailleur
9b50bc2197 Fix css 2018-08-09 19:29:48 +02:00
florian HENRY
06189f8153 Merge branch '6.0' into 6.0_fhe 2018-08-09 18:31:59 +02:00
florian HENRY
9024ed9e61 Merge branch '7.0' into 7.0_fhe 2018-08-09 17:47:21 +02:00
atm-greg
3d84adbd76 fix recurcivity 2018-08-09 12:21:48 +02:00
atm-greg
4e16f64af0 Fix project::delete to delete children tasks before parent tasks 2018-08-09 12:13:06 +02:00
Laurent Destailleur
8d54df4263 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-08-08 17:31:23 +02:00
Laurent Destailleur
63898b205e Clean ckeditor menu 2018-08-08 17:09:51 +02:00
Laurent Destailleur
d79778a67e Fix reponsive 2018-08-08 17:00:16 +02:00
Laurent Destailleur
de1386c83c Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0 2018-08-08 16:49:09 +02:00
Juanjo Menent
e2499392a9
Merge pull request #9215 from fmarcet/7.0 
Fix: Bad position when document have incoterms/notes
 2018-08-08 11:10:47 +02:00
Juanjo Menent
b840152bcd
Merge pull request #9217 from ATM-Nicolas/fix_undefined_index_notnull 
FIX : PHP warning, undefined index notnull
 2018-08-08 11:10:17 +02:00
Ferran Marcet
5ce31f65a4 Fix: Bad position when document have incoterms/notes 2018-08-07 11:40:11 +02:00
ATM-Nicolas
5b15e688af FIX : PHP warning, undefined index notnull 2018-08-07 09:38:18 +02:00
ptibogxiv
e84018ac15
Fix 3D secure 
convett to dolibarr standard stripe payment metadata
 2018-08-06 19:21:12 +02:00
florian HENRY
74d05da149 fix : display if error 2018-08-06 11:28:34 +02:00
florian HENRY
0d85eb52c5 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-08-03 17:10:26 +02:00
florian HENRY
615ed11534 fix bad use of test_sql_and_script_inject return int not value tested 2018-08-03 17:09:58 +02:00
atm-quentin
09dfcc6016 FIX exclude element of the select 2018-08-03 14:54:21 +02:00
Philippe
61e1f0508d FIX : Search on Ref project on order list 2018-08-03 11:08:09 +02:00
ATM-Nicolas
70adfb135d FIX : Missing behavior 2018-08-03 09:51:29 +02:00
Laurent Destailleur
6010d9de4b
Merge pull request #9158 from atm-gauthier/7.0_missing_hook 
FIX : missing hook to edit sql
 2018-08-02 18:36:25 +02:00
Laurent Destailleur
51effef629 Reset pagination when current page too high 2018-08-02 18:22:08 +02:00
Laurent Destailleur
17ed19503c Code comment 2018-08-02 17:51:04 +02:00
Laurent Destailleur
12fdbcce59 Fix trigger name 2018-08-02 17:49:05 +02:00
Laurent Destailleur
e85ec19018
Merge pull request #9093 from atm-gauthier/FIX_filters 
FIX : page must always be 0 when we search
 2018-08-02 17:48:35 +02:00
Laurent Destailleur
b5a0e14ffe
Merge pull request #9185 from atm-john/fix_situation_total_calcul 
Important: fix situation line's total
 2018-08-02 17:45:44 +02:00
ATM-Nicolas
f3090e4819 FIX : Wrong variable and trigger name 2018-08-02 16:05:54 +02:00
Juanjo Menent
5b3c6de06c
Merge pull request #9184 from atm-gauthier/7.0_fix_extrafieldkey 
FIX : extrafieldkey
 2018-08-02 11:24:19 +02:00
Juanjo Menent
1fbbaf2895
Merge pull request #9180 from atm-florian/7.0 
FIX: keep context filter on contact list on change column displayed
 2018-08-02 11:20:25 +02:00
Juanjo Menent
ce49230d71
Merge pull request #9177 from ATM-Nicolas/fix_preselect_project 
FIX : Keep same project when creating shipping from order
 2018-08-02 11:18:39 +02:00
florian HENRY
ceb85cfa45 fix : odt project and task extrafields management 2018-07-31 17:29:08 +02:00
gauthier
cadf931e8d FIX : extrafieldkey 2018-07-31 15:02:51 +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
florian HENRY
5d19361782 fix: keep context filter on contact list on change column displayed 2018-07-31 11:39:54 +02:00
ATM-Nicolas
1536bbc65e FIX : Keep same project when creating shipping from order 2018-07-30 15:16:53 +02:00
tarrsalah
8278a9fa52 FIX filter supplier invoice list by societe name. 2018-07-29 13:18:05 +01:00
Frédéric FRANCE
7dada7ae8e
fix #8820 2018-07-29 09:15:42 +02:00
Regis Houssin
e1877625a0 FIX clean code 2018-07-27 13:42:44 +02:00
Laurent Destailleur
8ab03c469a Fix migration 2018-07-27 13:42:32 +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
894f484de8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-27 12:34:02 +02:00
Laurent Destailleur
83ae27d122 FIX Deletion of files in migration 2018-07-27 12:33:36 +02:00
gauthier
c95d6271a9 FIX : missing hook to edit sql 2018-07-25 11:15:13 +02:00
Philippe
d7f58d0087 FIX search on ref project on propal list 2018-07-24 20:28:49 +02:00
Laurent Destailleur
7821e21e5b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:51 +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
927727edf3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-24 19:22:12 +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
f672e8bf02 Fix trans 2018-07-24 19:12:35 +02:00
Laurent Destailleur
f50aa03187
Merge pull request #9112 from atm-gauthier/FIX_multientity_replenish 
FIX: stock replenish with multientity
 2018-07-24 18:10:00 +02:00
Laurent Destailleur
e9eb8da61b
Update replenish.php 2018-07-24 18:09:50 +02:00
Laurent Destailleur
77c121b15c
Merge pull request #9099 from ATM-Nicolas/7.0 
NEW Set contactCivName substitution key
 2018-07-24 18:02:21 +02:00
Laurent Destailleur
ece655a84a
Merge pull request #9128 from atm-john/fix_situation_invoice_status 
Fix situation invoice status
 2018-07-24 17:49:53 +02:00
Laurent Destailleur
869a97c8d1
Update card.php 2018-07-24 17:49:10 +02:00
Laurent Destailleur
a469f841f7
Merge pull request #9140 from bugness-chl/8.0-bugfix-pdf 
FIX 2 bugfix for PDF generated by Templates/Cron: DueDate and translation
 2018-07-24 17:47:37 +02:00
Laurent Destailleur
bb9c53b41f
Merge pull request #9118 from bugness-chl/8.0 
corr. "group by" for PostgreSQL
 2018-07-24 17:43:36 +02:00
Laurent Destailleur
08a5b499fe
Merge pull request #9139 from bugness-chl/8.0-translation 
Translation: adding 'Enable' term in main
 2018-07-24 17:41:53 +02:00
Laurent Destailleur
71deb9ea60
Merge pull request #9143 from hregis/8.0_dict 
FIX field is autoincrement but not "rowid"
 2018-07-24 17:22:53 +02:00
Laurent Destailleur
68ad5d780c
Merge pull request #9142 from hregis/8.0_pg 
FIX missing drop old postgresql unique key
 2018-07-24 17:16:55 +02:00
Laurent Destailleur
438cdfc004 FIX #9141 2018-07-24 17:16:21 +02:00
Frédéric FRANCE
bde30b85ad
use defaut currency for supplier order 2018-07-24 17:06:12 +02:00
Laurent Destailleur
3bdf7d411d
Merge pull request #9125 from atm-john/fix_php7_warning_mysql 
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…
 2018-07-24 16:56:10 +02:00
Laurent Destailleur
a65c4ebecd
Merge pull request #9130 from hregis/8.0_bug 
FIX disable/enable foreign key checking for avoid errors
 2018-07-24 16:55:37 +02:00
Laurent Destailleur
8866b8eb1d
Merge pull request #9133 from frederic34/patch-12 
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
 2018-07-24 16:54:04 +02:00
Regis Houssin
20a1ffe810 FIX field is autoincrement but not "rowid" 2018-07-24 12:15:54 +02:00
Regis Houssin
25c93de801 FIX missing drop old postgresql unique key 2018-07-24 11:23:44 +02:00
Laurent Destailleur
ccd7332647 Fix default value of joinfile when creating a new email template 2018-07-24 01:46:14 +02:00
Chl
0f115dafee 2 bugfix for PDF generated by Templates/Cron: DueDate and translation 
When launching Cron on a facturerec with auto_validate at 1, the
generated PDF doesn't contain the DueDate, and some tokens like
__INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not
translated (tested with fr_FR).
 2018-07-24 00:39:21 +02:00