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

66677 Commits

Author SHA1 Message Date
Frédéric FRANCE
ff37fddcf1
Update myobject_agenda.php 2019-05-19 09:16:45 +02:00
Frédéric FRANCE
53a09a0dd4
Update agenda.php 2019-05-19 09:15:51 +02:00
Frédéric FRANCE
c8027ccf1a
Update agenda.php 2019-05-19 09:15:10 +02:00
Frédéric FRANCE
7d66cc1ab1
Update agenda.php 2019-05-19 09:14:29 +02:00
Frédéric FRANCE
06421c200d
Update agenda.php 2019-05-19 09:13:46 +02:00
Frédéric FRANCE
19085ed200
dol_print_object_info return void 2019-05-19 09:08:59 +02:00
Laurent Destailleur
3109f8e07a
Merge pull request #11217 from inoveaconseil/FIX11135 
FIX #11135
 2019-05-19 02:23:49 +02:00
Laurent Destailleur
4b3d0ed50c
Update user.class.php 2019-05-19 02:21:42 +02:00
Laurent Destailleur
ea5ffbb0bf
Merge pull request #11216 from atm-florian/8.0 
fix:  #11187
 2019-05-19 02:19:12 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Nicolas ZABOURI
61c17f8d0f FIX #11135 2019-05-19 02:06:37 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:06:20 +02:00
florian HENRY
e4d87ab2e7 fix: #11189 2019-05-19 02:05:13 +02:00
Laurent Destailleur
7738787729 Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2019-05-19 02:03:16 +02:00
florian HENRY
6e7fe1a6c2 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2019-05-19 01:58:38 +02:00
florian HENRY
4311a1ece8 fix: #11187 2019-05-19 01:58:20 +02:00
Laurent Destailleur
0f3ae6dc39
Merge pull request #11215 from ATM-Marc/FIX_8.0_invoice_default_product_type 
FIX: invoice class: bad SQL request if product type not set
 2019-05-19 01:58:13 +02:00
Laurent Destailleur
2fd3eb8bdf
Update facture.class.php 2019-05-19 01:58:01 +02:00
Laurent Destailleur
684cbbdddb
Merge pull request #11212 from ATM-Marc/FIX_8.0_modulebuilder_foreignkey 
FIX: modulebuilder: hardcoded llx_
 2019-05-19 01:55:02 +02:00
florian HENRY
7f8c118466 fix: #11015 2019-05-19 01:52:50 +02:00
florian HENRY
272b5f7d6a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-19 01:52:14 +02:00
Laurent Destailleur
32485c2782 Fix phpcs 2019-05-19 01:45:33 +02:00
Laurent Destailleur
a4cea5b877 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-19 01:41:53 +02:00
Laurent Destailleur
c6ccb92a51 Fix table shown when there is no perm 
Fix edit admin status of another admin
 2019-05-19 01:41:42 +02:00
ATM-Marc
83c38570e9 FIX: invoice class: bad SQL request if product type not set 2019-05-19 01:01:21 +02:00
Maxime Kohlhaas
1d980342ec Fix #8344 2019-05-19 00:05:23 +02:00
florian HENRY
c3dbbe51cf fix missing migration sql for ticket now stable on 10 2019-05-18 23:57:00 +02:00
Laurent Destailleur
3e3ed6f9e7 Fix phpcs 2019-05-18 20:11:51 +02:00
ATM-Marc
9b805f742b FIX: modulebuilder: hardcoded llx_ 2019-05-18 20:09:00 +02:00
Laurent Destailleur
b35cdf88e8
Merge pull request #11210 from atm-florian/develop 
fix :email collector for event creation
 2019-05-18 19:31:21 +02:00
Laurent Destailleur
41cb13b1cc Fix warning 2019-05-18 19:28:14 +02:00
Laurent Destailleur
4517d84e3a FIX Disable a module 2019-05-18 19:22:17 +02:00
florian HENRY
099906a73b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-18 18:43:02 +02:00
florian HENRY
0787eee9b8 fix :email collector for event creation 2019-05-18 18:42:46 +02:00
Maxime Kohlhaas
4f64250ad6 Fix menu links for holidays 2019-05-18 17:12:25 +02:00
Maxime Kohlhaas
ea4dcbc77a Add translation 2019-05-18 17:07:55 +02:00
Maxime Kohlhaas
6c195d7bdf Add warning delay for holidays 2019-05-18 17:07:29 +02:00
Maxime Kohlhaas
ea1efa5e88 Fix missing dashboard stats for holidays 2019-05-18 17:06:33 +02:00
Maxime Kohlhaas
28a4785b3a Fix missing TOKEN 2019-05-18 17:06:23 +02:00
Laurent Destailleur
a9e96031de Fix phpcs 2019-05-18 17:04:37 +02:00
Laurent Destailleur
2c78524d4f Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 17:03:33 +02:00
Laurent Destailleur
e46481d837 Fix phpcs 2019-05-18 17:03:21 +02:00
Laurent Destailleur
a1ec074d03
Merge pull request #11205 from ATM-Marc/NEW_supplier_proposal_contact_type 
FIX: add contact types for supplier proposals (Issue #10949)
 2019-05-18 16:56:40 +02:00
Laurent Destailleur
50335179d3
Merge pull request #11208 from atm-florian/develop 
fix:  scrunitizer
 2019-05-18 16:46:49 +02:00
Laurent Destailleur
1ad2c09800 Fix size of popup 2019-05-18 16:38:52 +02:00
Laurent Destailleur
5f598b1c3f Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 16:26:03 +02:00
Laurent Destailleur
b40eb92ce7 Mass action for closing members 2019-05-18 16:25:45 +02:00
florian HENRY
ebe37df9db scrunitizer 2019-05-18 16:19:44 +02:00
florian HENRY
47ae988b57 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-18 16:18:22 +02:00
florian HENRY
12a8008107 scrunitizer 2019-05-18 16:18:14 +02:00
Laurent Destailleur
94f5f6c655
Merge pull request #11207 from atm-john/FIX_scrutyniser 
FIX: scrutinizer feedback
 2019-05-18 16:05:24 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
ATM John BOTELLA
f714b45efb FIX scrutinizer feedback 2019-05-18 15:53:07 +02:00
florian HENRY
c519906c9e fix scrunitizer 2019-05-18 15:46:49 +02:00
florian HENRY
f1aad766ca fix: bad sql request 2019-05-18 15:11:12 +02:00
florian HENRY
f3315bb8f5 fix: bad sql request 2019-05-18 15:09:03 +02:00
ATM-Marc
2c104ccc4a NEW: contact types for supplier proposals 2019-05-18 14:22:04 +02:00
florian HENRY
9ef5767fd5 phpcs 2019-05-18 12:28:39 +02:00
florian HENRY
c2b1c8d439 remove bad fix 2019-05-18 12:26:36 +02:00
florian HENRY
730820bb26 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-18 12:11:48 +02:00
florian HENRY
02af7ca25e fix pb with multicompny payment dictionnary on faxcture card 2019-05-18 12:11:28 +02:00
Laurent Destailleur
26d4875f8f Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 02:27:23 +02:00
Laurent Destailleur
6c4a4c34c4 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-18 02:26:40 +02:00
Laurent Destailleur
b33d0fcb26
Merge pull request #11201 from homer8173/develop 
missing file on bom
 2019-05-18 02:24:59 +02:00
Laurent Destailleur
a850c7aede Fix if setup not complete 2019-05-18 02:22:23 +02:00
Laurent Destailleur
c6af18b240 Remove infosin debug too dangerous for security 2019-05-18 01:38:42 +02:00
Laurent Destailleur
9e38f3122d Update for pgsql 2019-05-18 01:26:44 +02:00
Norbert Penel / OSCSS
26fd2ee99d missing file on bom 
agenda was not here
 2019-05-18 01:14:35 +02:00
Maxime Kohlhaas
095fd2769a Fix project beluga order status 2019-05-18 01:11:34 +02:00
Laurent Destailleur
92dbc3ec1f
Merge pull request #11199 from atm-maxime/fix_resource_deletefile 
Fix resource delete with attached file
 2019-05-18 00:59:35 +02:00
Laurent Destailleur
68118e55dc
Update api_invoices.class.php 2019-05-18 00:58:43 +02:00
Laurent Destailleur
30d91994b8
Merge pull request #11197 from homer8173/develop 
fix modulebuilder & takepos
 2019-05-18 00:56:49 +02:00
Laurent Destailleur
950b963762
Merge pull request #11196 from inoveaconseil/FIX#11045 
FIX #11045
 2019-05-18 00:55:38 +02:00
Laurent Destailleur
8fc5fdd1c7
Update myobject_card.php 2019-05-18 00:54:41 +02:00
Laurent Destailleur
51f9067a11
Merge pull request #11194 from inoveaconseil/FIX11160 
FIX #11160
 2019-05-18 00:50:33 +02:00
Maxime Kohlhaas
aed71be7f1 Fix resource delete with attached file 2019-05-18 00:47:32 +02:00
Laurent Destailleur
c50a3c4a78
Merge pull request #11190 from atm-florian/develop 
add info into change log
 2019-05-18 00:47:24 +02:00
Laurent Destailleur
051308c679
Update eldy_menu.php 2019-05-18 00:46:32 +02:00
Laurent Destailleur
1b29992443
Merge pull request #11186 from inoveaconseil/Fixsyntax 
Fix syntax of path
 2019-05-18 00:45:52 +02:00
florian HENRY
0c3500fc5d fix : #10562 2019-05-18 00:45:41 +02:00
Maxime Kohlhaas
1af69d4c8f Fix varnames in invoice api 2019-05-18 00:40:29 +02:00
Norbert Penel / OSCSS
f569785e85 fix modulebuilder 
tms mustn't have a not null
 2019-05-18 00:39:31 +02:00
Norbert Penel / OSCSS
cf207aa545 FIX new takepos error messages 
the terminal number implementation must be used on global conf key
 2019-05-18 00:29:32 +02:00
Norbert Penel / OSCSS
5ddf16685f fix missing traduction on societe 
a translation key was missing
 2019-05-18 00:25:46 +02:00
Norbert Penel / OSCSS
13b75e35a0 FIx tms field made with modulebuilder 
all new module appear to have a bug on tms, no data can be inserted due to tms default value that can't be null
 2019-05-18 00:20:44 +02:00
Nicolas ZABOURI
9ab718ec5e FIX #11045 2019-05-18 00:19:06 +02:00
ATM-Marc
b85ed3e0b7 FIX: mail presend: can overwrite a file previously uploaded 2019-05-18 00:11:15 +02:00
Nicolas ZABOURI
cf45bbb698 FIX #11160 2019-05-17 23:50:57 +02:00
florian HENRY
fcfabd40af fix missing cell into perms screen 2019-05-17 18:10:40 +02:00
Maxime Kohlhaas
2a2f0557cf Fix : display hr tab on user if rights to read all 2019-05-17 17:07:38 +02:00
Laurent Destailleur
e95acc9a81 Add warning if missing module 2019-05-17 13:19:22 +02:00
Nicolas ZABOURI
1f789fa266 FIX syntax 2019-05-17 11:24:24 +02:00
Laurent Destailleur
8bcc7cb370 Fix creation of duplicate payment intents 2019-05-17 00:26:39 +02:00
Laurent Destailleur
ae3a20d6ff FIX compatibility with intent payment_modes 2019-05-17 00:10:44 +02:00
Laurent Destailleur
52c1f42734 Debug payment with stripe Intent 2019-05-16 23:11:49 +02:00
Laurent Destailleur
fa5c5a3336 Update Stripe API to 6.35 2019-05-16 21:41:14 +02:00
Laurent Destailleur
ced2c7383a
Merge pull request #11178 from aspangaro/10.0_openconcerto 
NEW Accountancy Add OpenConcerto export format
 2019-05-16 21:24:14 +02:00
Laurent Destailleur
b8cb21e452
Merge pull request #11177 from javierybar/master 
Simplify terminal variables in Takepos
 2019-05-16 21:23:15 +02:00
Laurent Destailleur
c1ec7454a1
Merge branch 'develop' into clean_10_beta 2019-05-16 21:21:51 +02:00
Laurent Destailleur
0d6841dacb
Merge pull request #11176 from aspangaro/10.0_FEC 
FIX FEC Remove useless field 'validated'
 2019-05-16 21:20:20 +02:00
Laurent Destailleur
53b7f3fe92
Merge pull request #11173 from aspangaro/10.0_accountancy_cat 
NEW Add accoutancy sell intra and export in product import
 2019-05-16 21:14:46 +02:00
Laurent Destailleur
c24c81692d
Update modAccounting.class.php 2019-05-16 21:13:57 +02:00
Laurent Destailleur
d1e5c525aa Fix warning 2019-05-16 14:47:42 +02:00
Laurent Destailleur
ac1bab1711 Fix sanitize params 2019-05-16 12:28:57 +02:00
Laurent Destailleur
2d0b3b7b23 Fix dol_sort_array for objects 2019-05-16 12:25:14 +02:00
Laurent Destailleur
bdb467b17a fix typo 2019-05-16 09:32:06 +02:00
Laurent Destailleur
fd5048ef73 Fix reported by phpstan 2019-05-15 19:16:48 +02:00
Laurent Destailleur
4a69541419 Several bug fixes using phpstan 2019-05-15 18:59:46 +02:00
Laurent Destailleur
717cafe213 Fix doc 2019-05-15 17:50:35 +02:00
Alexandre SPANGARO
f123f9951f NEW Add OpenConcerto export format 2019-05-15 12:16:03 +02:00
javierybar
114ddea54f Simplify terminal variables 2019-05-14 19:58:08 +02:00
Laurent Destailleur
9f8f45d5bc FIX Payment on supplier invoice should not mix credit note and standard 
invoices.
 2019-05-14 12:00:58 +02:00
Laurent Destailleur
49d65710ba Fix date missing 2019-05-14 10:31:11 +02:00
Alexandre SPANGARO
60d00e2f5c FIX FEC Remove useless field 'validated' 2019-05-14 06:46:06 +02:00
Francis Appels
79a347ab11 Fix PHPCS contract list 2019-05-13 22:49:43 +02:00
Alexandre SPANGARO
6f9010c362 NEW add category in export of chart of accounts 2019-05-13 22:02:43 +02:00
Francis Appels
6e5d826d65 Clean PHPCS for commonobject.class 2019-05-13 22:02:33 +02:00
Laurent Destailleur
04f7261bfc Fix field date was not visible 2019-05-13 21:34:30 +02:00
Francis Appels
a2d4a59321 Merge branch 'develop' into clean_10_beta 2019-05-13 21:27:13 +02:00
Alexandre SPANGARO
d99424cdf0 NEW Add accoutancy sell intra and export in product import 2019-05-13 21:19:18 +02:00
Laurent Destailleur
278d4fdb8e Fix css 2019-05-13 20:55:05 +02:00
Laurent Destailleur
b63803e8ef Fix missing dir 2019-05-13 20:42:09 +02:00
Laurent Destailleur
e2408fb54d
Merge pull request #11170 from atm-greg/Fix_margin_calculation_on_display 
fix useless calculation
 2019-05-13 20:20:01 +02:00
Laurent Destailleur
f576d441bc FIX #11171 
Upgrade Mobile_Detect. This
 2019-05-13 19:53:04 +02:00
Laurent Destailleur
94387cd0e1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-13 12:28:25 +02:00
Laurent Destailleur
75646e365d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/contrat/services_list.php
	htdocs/expensereport/list.php
	htdocs/product/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/projet/list.php
 2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-13 12:22:14 +02:00
atm-greg
644f247910 fix useless calculation 2019-05-13 12:02:46 +02:00
Laurent Destailleur
1626c9fb6e
Merge pull request #11145 from atm-gauthier/8.0_fix_filename_with_two_spaces 
FIX : use dol_sanitizeFileName() function to remove double spaces in …
 2019-05-13 12:01:05 +02:00
Laurent Destailleur
c67d79a4e2
Update files.lib.php 2019-05-13 12:00:13 +02:00
Laurent Destailleur
30e08d8f9c
Merge pull request #11167 from andreubisquerra/master 
TakePOS as stable
 2019-05-13 11:43:17 +02:00
Laurent Destailleur
f0cdaff936 Fix status of crons 2019-05-13 10:26:30 +02:00
Laurent Destailleur
39c9efbc51 Fix remove non existing status 2019-05-13 10:23:09 +02:00
Laurent Destailleur
ec8b640182 Fix remove non existing status 2019-05-13 10:22:26 +02:00
Laurent Destailleur
8b0a0352e6 Fix responsive of help center 2019-05-13 09:47:58 +02:00
John BOTELLA
b0e780fab0 Fix travis 2019-05-13 09:39:45 +02:00
Laurent Destailleur
e84003d4ff Escape param 2019-05-13 09:29:34 +02:00
Laurent Destailleur
7a75567ad9 FIX Debug ticket module 2019-05-12 16:34:49 +02:00
Laurent Destailleur
5876582030 Fix responsive 2019-05-12 15:56:29 +02:00
Juanjo Menent
072a455ca4 Prepare 8.0.6 2019-05-11 22:55:42 +02:00
andreubisquerra
166ac1b8c2 TakePOS as stable as indicated in the Changelog 2019-05-11 21:33:26 +02:00
Juanjo Menent
f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0 
# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php
 2019-05-11 17:31:23 +02:00
Juanjo Menent
3a99ef7319 Fix: missing GETPOST params 2019-05-11 17:04:05 +02:00
Juanjo Menent
3ae2d71ea6 Fix: missing GETPOST params 2019-05-11 17:00:55 +02:00
Juanjo Menent
91ae365588 Fix: missing GETPOST params 2019-05-11 16:58:00 +02:00
Juanjo Menent
6206519456 Fix: missing GETPOST params 2019-05-11 16:54:56 +02:00
Juanjo Menent
2e6cb2afaa Fix: missing GETPOST params 2019-05-11 16:53:16 +02:00
Juanjo Menent
dc9f8a349f Fix: missing GETPOST params 2019-05-11 16:50:31 +02:00
Juanjo Menent
80ef97e215 FIX: #11025 2019-05-11 16:41:01 +02:00
Juanjo Menent
759427f6ac FIX: #11025 2019-05-11 16:36:35 +02:00