Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
91,506 Commits 36 Branches 189 Tags
eb0fd1674d26a8157ff133173f9177ee6a23e81f
Commit Graph

21986 Commits

Author SHA1 Message Date
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
776e305272 Typo 2020-07-05 13:50:21 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
 2020-07-05 13:01:00 +02:00
Laurent Destailleur
b726e96f4b FIX Update form erased extrafields that were hidden 2020-07-04 17:09:20 +02:00
florian HENRY
03ae31eced remove warning when date end contract line empty 2020-07-04 16:37:50 +02:00
florian HENRY
335a767f22 remove warning when date end contract line empty 2020-07-04 16:37:11 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO 
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
 2020-07-04 16:14:53 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
 2020-07-04 13:13:17 +02:00
Laurent Destailleur
4819e58d06 Fix trans 2020-07-04 13:04:53 +02:00
Laurent Destailleur
fce81a4bf1 Rename var and fix position of checkbox 2020-07-03 01:30:53 +02:00
Laurent Destailleur
94188af270 Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab 
NEW multiselect type and date to date filter
 2020-07-03 00:57:44 +02:00
Laurent Destailleur
1f466f3846 Update company.lib.php 2020-07-03 00:57:15 +02:00
Laurent Destailleur
03aa4873d1 Merge pull request #14141 from fappels/12_fix_extrafield_html 
FIX html lost on html extrafield
 2020-07-03 00:49:31 +02:00
Laurent Destailleur
fd617658ef Fix syntax 2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d fix #14143 2020-07-03 00:34:50 +02:00
Laurent Destailleur
a08e4bdf3f Merge pull request #14163 from atm-quentin/FIX_line_reorder_rank_develop 
NEW get all child recursively
 2020-07-03 00:28:32 +02:00
Laurent Destailleur
a44f5376da Update commonobject.class.php 2020-07-03 00:27:30 +02:00
Laurent Destailleur
bc1006e875 Merge pull request #14159 from Je2fb/develop 
FIX #14143 DynamicPrice
 2020-07-03 00:25:38 +02:00
Laurent Destailleur
91266babea Merge pull request #14170 from andreubisquerra/master 
NEW: Appearance tab in TakePOS with more visual parameters
 2020-07-03 00:19:35 +02:00
Laurent Destailleur
6b16f64928 Fix properties used that does not exists 2020-07-02 03:39:47 +02:00
Laurent Destailleur
ca769a3c62 Fix scrutinizer errors 2020-07-02 03:37:01 +02:00
andreubisquerra
9e4d7627f3 Fix travis 2020-07-01 22:55:00 +02:00
jove@bisquerra.com
76f3724191 NEW: Appearance tab in TakePOS with more visual parameters 2020-07-01 22:34:35 +02:00
Laurent Destailleur
d3c23428d5 FIX Use of office365 TLS with SMTPs method. 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-07-01 17:11:13 +02:00
Laurent Destailleur
324c8e9b54 FIX Use of office365 TLS with SMTPs method. 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-07-01 17:10:33 +02:00
Laurent Destailleur
92a36dbeee FIX Use of office365 TLS with SMTPs method. 2020-07-01 17:01:46 +02:00
Laurent Destailleur
226c907e35 FIX Use of office365 TLS with SMTPs method. 2020-07-01 17:00:52 +02:00
John Botella
2a9311b2d8 Fix email spoofing - with hidden conf 2020-07-01 16:55:23 +02:00
Laurent Destailleur
e2a9743dd4 Debug module credit transfer 2020-07-01 14:19:47 +02:00
quentin
d2a364eea8 NEW get all child recursively 2020-07-01 14:10:43 +02:00
quentin
39651953b3 FIX refacto 2020-07-01 14:04:41 +02:00
quentin
267aa7605b Merge remote-tracking branch 'dolibarr/develop' into NEW_filter_on_event_tab 2020-07-01 14:00:49 +02:00
Laurent Destailleur
5f2486049e Fix trans 2020-07-01 13:22:15 +02:00
Laurent Destailleur
b8ea58f18c Fix phpcs 2020-06-30 16:15:10 +02:00
Laurent Destailleur
4baa00ba89 Fix phpcs 2020-06-30 13:20:46 +02:00
Laurent Destailleur
88cf904ced Fix edit of tag of website 2020-06-30 02:50:58 +02:00
Laurent Destailleur
9bb0ef04f5 Fix upload of file in import module 2020-06-29 18:07:51 +02:00
Laurent Destailleur
146c521efd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/filefunc.inc.php
 2020-06-29 18:06:42 +02:00
Laurent Destailleur
bb74804b74 NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT 2020-06-29 17:58:04 +02:00
Laurent Destailleur
5b3670f300 FIX SQL syntax error when editing extrafields 
Conflicts:
	htdocs/core/lib/security.lib.php
 2020-06-29 14:28:53 +02:00
Laurent Destailleur
7c5b0be6a3 FIX SQL syntax error when editing extrafields 2020-06-29 13:48:00 +02:00
Laurent Destailleur
7c4e737668 Clean code 2020-06-29 09:53:55 +02:00
Francis Appels
5d65b5f660 fix html should not do price2num 2020-06-29 09:07:54 +02:00
Laurent Destailleur
a5893db106 FIX upload documents into manual ECM was reported a permission error 2020-06-28 22:05:55 +02:00
Laurent Destailleur
ab88890f3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-28 21:48:28 +02:00
Laurent Destailleur
95729e2375 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2020-06-28 21:47:43 +02:00
Laurent Destailleur
8dee17446d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/company.lib.php
 2020-06-28 21:46:08 +02:00
Laurent Destailleur
1194c61857 Merge pull request #14125 from ATM-Consulting/10.0_FIX_pgsql_on_company.lib.php_2 
FIX 10.0 - fatal with postgreSQL
 2020-06-28 21:20:20 +02:00
Laurent Destailleur
b725aca8aa Merge branch 'develop' into 11.0_bug 2020-06-28 21:19:11 +02:00
Laurent Destailleur
df7996a8eb Merge pull request #14126 from OPEN-DSI/fix-import-upload-file 
FIX upload file in import module
 2020-06-28 21:13:00 +02:00