atm-quentin
d01faeee89
FIX set ordered if no more validate reception
2018-10-23 09:22:13 +02:00
Abbes Bahfir
7e7473e7df
New : parameter for getnomurl in field dpecification
2018-10-23 01:25:38 +01:00
Abbes Bahfir
5bac6a92e6
Fix:empty value instead of 0 for empty links
2018-10-23 00:03:34 +01:00
Frédéric FRANCE
85a94ec577
Update view.php
2018-10-22 22:40:18 +02:00
Frédéric FRANCE
90b85c1106
Update html.form.class.php
2018-10-22 22:23:43 +02:00
Frédéric FRANCE
e49f2bc562
Update document_actions_post_headers.tpl.php
2018-10-22 22:20:26 +02:00
Frédéric FRANCE
4aec343b24
Update html.form.class.php
2018-10-22 22:13:54 +02:00
Frédéric FRANCE
38df6ac27b
remove deprecated form_confirm
2018-10-22 21:57:18 +02:00
Frédéric FRANCE
570ee200d8
Merge remote-tracking branch 'upstream/develop' into fixpdf
2018-10-22 20:19:28 +02:00
Laurent Destailleur
f65df9e541
NEW Add option PDF_DISABLE_MYCOMPANY_LOGO to disable logo on PDF
2018-10-22 20:06:03 +02:00
Laurent Destailleur
bf46a35a31
Fix size of key for extrafield of type select
2018-10-22 19:05:04 +02:00
atm-quentin
0a033f4cfd
FIX : manage error
2018-10-22 16:49:36 +02:00
atm-quentin
5b69357233
FIX keep search value while changing page
2018-10-22 16:08:43 +02:00
atm-quentin
7684d7bddd
FIX export comment better than desc of order line
2018-10-22 15:51:47 +02:00
root
dc6a30997c
add missing require
2018-10-22 15:47:42 +02:00
ATM-Nicolas
cf28e4e442
FIX : Variable name
2018-10-22 15:19:33 +02:00
root
0c61162698
fix langs workflow reception
2018-10-22 14:56:13 +02:00
root
39f34dd36b
fix script migrate table
2018-10-22 14:49:21 +02:00
atm-quentin
cfff4c7df8
NEW add ref supplier on supplier invoice
2018-10-22 14:32:50 +02:00
Alexandre SPANGARO
930dce7611
change class name from lettering to Lettering
2018-10-22 06:39:23 +02:00
Alexandre SPANGARO
3f79580b19
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-22 06:33:34 +02:00
fappels
beb906b5f1
Deprecate class property before removing it.
2018-10-21 22:52:53 +02:00
De Coninck Laurent
59307165ce
fix the pdf merge
...
fix the pdf merge.
[See: #9824 ]
2018-10-21 19:45:33 +02:00
Frédéric FRANCE
0171301543
code comment categories class
2018-10-21 19:19:35 +02:00
aplose
8a27ead39f
fork sync
...
Merge remote-tracking branch 'upstream/7.0' into 7.0
2018-10-21 18:45:40 +02:00
aplose
263b53bf63
Paybox Update : include Paybox HMAC key in process in order to keep
...
the module working with Paybox.
2018-10-21 18:28:05 +02:00
Laurent Destailleur
2816bdf747
FIX Date into filename of FEC file.
2018-10-21 16:22:56 +02:00
Laurent Destailleur
4e6b21881f
Fix bug reported by scrutinizer
2018-10-21 12:14:20 +02:00
Laurent Destailleur
868caa4991
Missing ref_customer in popup
2018-10-21 12:05:31 +02:00
Laurent Destailleur
f6b3bc3bdb
Fix thirdparty popup
2018-10-21 12:03:22 +02:00
Laurent Destailleur
fa99ea1f0f
Fix thirdparty popup
2018-10-21 11:55:25 +02:00
Laurent Destailleur
cd9431809b
Fix: do not loose country_code after update
2018-10-21 11:44:21 +02:00
Laurent Destailleur
d38c68e54f
Remove unexpected char
2018-10-21 11:10:04 +02:00
Frédéric FRANCE
f169ec9259
Update ajaxdirtree.php
2018-10-21 10:37:49 +02:00
Frédéric FRANCE
83e2951107
Update style.css.php
2018-10-21 09:59:14 +02:00
Frédéric FRANCE
28c86a613d
Update style.css.php
2018-10-21 09:39:07 +02:00
Frédéric FRANCE
c4029f5e5f
Update style.css.php
2018-10-21 09:23:33 +02:00
ias-ceo
cce2e2414f
missing simicolon
2018-10-21 07:41:40 +03:00
Frédéric FRANCE
5f6cbda5a6
Update facture.class.php
2018-10-20 22:34:00 +02:00
Frédéric FRANCE
fbc5ce623e
payments
2018-10-20 17:17:21 +02:00
Frédéric FRANCE
02954931d8
Update thirdparty_lettrage_supplier.php
2018-10-20 16:27:15 +02:00
Frédéric FRANCE
d3022413ef
Update thirdparty_lettrage.php
2018-10-20 16:25:57 +02:00
Frédéric FRANCE
fab10acc15
change class name from lettering to Lettering
2018-10-20 16:23:43 +02:00
Frédéric FRANCE
4d72cafa52
code comment
2018-10-20 13:47:51 +02:00
Frédéric FRANCE
550dc622ca
code comment
2018-10-20 13:40:40 +02:00
Alexandre SPANGARO
a7de7013a1
Update code
2018-10-20 11:20:53 +02:00
Alexandre SPANGARO
921757c4a3
Fix travis
2018-10-20 10:57:59 +02:00
Alexandre SPANGARO
5cbcef4465
Debug Lettering
2018-10-20 08:26:30 +02:00
Alexandre SPANGARO
d3856d9289
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-20 06:35:39 +02:00
Frédéric FRANCE
f322c73dd7
Update ajax.lib.php
2018-10-19 22:52:18 +02:00
Frédéric FRANCE
042118fe38
fix it
2018-10-19 18:35:16 +02:00
Abbes Bahfir
bfadd39e8c
Fix: Grant right to child classes to use Category methods
2018-10-19 17:27:38 +01:00
Frédéric FRANCE
c811d5a371
fix new pdf
2018-10-19 18:20:06 +02:00
De Coninck Laurent
402bbbe839
fix the member e-mail on resign and validation.
...
Since the member module is only using the new configuration and the name of the global variabels changed you have a blocking e-mail error when you try to resign or validate a member. In order to fix that I fallback on the previous variable like that it's still working.
[see: #9640 ]
2018-10-19 17:23:53 +02:00
atm-greg
44b317e03e
fix display
2018-10-19 16:49:32 +02:00
atm-greg
6a3661586f
create payment for the last loanschedule
2018-10-19 16:12:21 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files
...
Experimental new pdf documents using new column system
2018-10-19 15:51:54 +02:00
Laurent Destailleur
4571210bcf
Fix remove deprecated field
2018-10-19 15:45:56 +02:00
atm-greg
582608cc57
manage fk_bank on loanschedule
2018-10-19 15:36:13 +02:00
Laurent Destailleur
897a2b09a7
Removed scrutinizer warning
2018-10-19 15:02:54 +02:00
Laurent Destailleur
b32ffdbbb9
Clean code
2018-10-19 14:59:00 +02:00
Laurent Destailleur
0408d123ec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:46:39 +02:00
Laurent Destailleur
e4b5cc154e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:46:32 +02:00
Laurent Destailleur
33cd0e84d2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2018-10-19 14:44:50 +02:00
Laurent Destailleur
57ad200ae5
Fix regression in creating discount
2018-10-19 14:43:10 +02:00
Laurent Destailleur
5a228bf394
Merge pull request #9786 from aspangaro/9.0_accountancy2
...
Fix FEC on accountancy movement card
2018-10-19 14:33:46 +02:00
Laurent Destailleur
4e82a6da46
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:32 +02:00
Laurent Destailleur
6a6a8ae14b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:22 +02:00
Laurent Destailleur
91745491ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-19 14:27:37 +02:00
Laurent Destailleur
5a1a5548df
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
2018-10-19 14:27:15 +02:00
Laurent Destailleur
47abbd3eb2
Fix bad merge
2018-10-19 14:23:36 +02:00
Laurent Destailleur
13171b0b55
Merge pull request #9781 from frederic34/patch-17
...
do not trim int
2018-10-19 14:18:32 +02:00
Laurent Destailleur
36ae81c749
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-19 14:17:20 +02:00
Laurent Destailleur
de4ead2558
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
htdocs/core/actions_massactions.inc.php
htdocs/product/reassort.php
2018-10-19 14:16:53 +02:00
Laurent Destailleur
6d1a934e8d
Merge pull request #9792 from atm-greg/Disable_customerprospect_thirdparty_type
...
NEW Add configuration to disable "customer/prospect" thirdparty type
2018-10-19 13:47:33 +02:00
Laurent Destailleur
c1d2556965
Update admin.lang
2018-10-19 13:47:18 +02:00
Laurent Destailleur
b6cb16a457
Merge pull request #9783 from frederic34/patch-18
...
Update menubase.class.php
2018-10-19 13:44:11 +02:00
Laurent Destailleur
86216960d4
Merge pull request #9785 from ptibogxiv/patch-81
...
NEW ADD civility list in API
2018-10-19 13:41:20 +02:00
Laurent Destailleur
078654b114
Merge pull request #9782 from ptibogxiv/patch-79
...
FIX uniformization dates of order in API
2018-10-19 13:39:10 +02:00
Laurent Destailleur
5f309bf155
Update commande.class.php
2018-10-19 13:38:23 +02:00
Laurent Destailleur
762d82f2fe
Move declaration into common
2018-10-19 13:38:05 +02:00
Laurent Destailleur
cff2b923f9
Merge pull request #9784 from ptibogxiv/patch-80
...
FIX harmony in date name with API
2018-10-19 13:29:59 +02:00
Laurent Destailleur
5a9f0cbff7
Merge pull request #9796 from frederic34/patch-21
...
do not trim int
2018-10-19 13:26:08 +02:00
Laurent Destailleur
ee4f6602cc
Merge pull request #9795 from frederic34/patch-20
...
do not trim int
2018-10-19 13:25:39 +02:00
Laurent Destailleur
b12769e5c1
Merge pull request #9803 from simnandez/develop
...
NEW Child label of variants change if parent label changes
2018-10-19 13:23:35 +02:00
Laurent Destailleur
8a88b66c9d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 13:18:28 +02:00
Laurent Destailleur
932a993b86
Merge pull request #9810 from andreubisquerra/master
...
Fix delete without any selected line on takepos
2018-10-19 13:18:07 +02:00
Laurent Destailleur
c13e555d5f
Merge pull request #9811 from frederic34/patch-24
...
use strict comparaison
2018-10-19 13:17:24 +02:00
Laurent Destailleur
24ae38abcc
Merge pull request #9797 from frederic34/patch-22
...
do not trim int
2018-10-19 13:03:03 +02:00
Laurent Destailleur
8af16609ca
Merge pull request #9779 from frederic34/patch-15
...
Update html.formmail.class.php
2018-10-19 13:02:15 +02:00
Laurent Destailleur
324f59ecc9
Merge pull request #9778 from frederic34/patch-9
...
add errors def to form class
2018-10-19 13:01:31 +02:00
Laurent Destailleur
0e33f18a3a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 12:58:31 +02:00
Laurent Destailleur
d086a71104
Merge pull request #9780 from frederic34/patch-16
...
fix phpunit
2018-10-19 12:58:15 +02:00
Laurent Destailleur
c01e6591ed
Merge pull request #9798 from frederic34/patch-23
...
code comment
2018-10-19 12:57:25 +02:00
Laurent Destailleur
c4e67de5c9
Merge pull request #9814 from Mavyre/patch-2
...
Fixed all resources displaying on add in projects, events...
2018-10-19 12:57:07 +02:00
Laurent Destailleur
b6e333876e
FIX #9813
2018-10-19 12:56:21 +02:00
Laurent Destailleur
44e0bc9aed
Merge pull request #9812 from frederic34/docodt
...
add log and comment
2018-10-19 12:53:54 +02:00
Laurent Destailleur
9eed87da8e
Merge pull request #9794 from frederic34/patch-19
...
do not trim int
2018-10-19 12:51:26 +02:00
Laurent Destailleur
4bdde9ad56
Update ticketlogs.class.php
2018-10-19 12:51:14 +02:00
Laurent Destailleur
696023c1aa
NEW Enhancement in the generic file manager
2018-10-19 12:47:59 +02:00
Juanjo Menent
34118bcf20
New: works with variants:
...
- Multiprices compatibility
2018-10-19 12:02:14 +02:00
Juanjo Menent
26dd738f3b
Merge remote-tracking branch 'upstream/develop' into develop
2018-10-19 12:00:22 +02:00
Laurent Destailleur
985ab1efda
FIX delete of a file in file_manager return to same dir
2018-10-19 10:59:34 +02:00
Juanjo Menent
1714bce8a1
New: works with variants:
...
- Better function name
2018-10-19 08:53:01 +02:00
Juanjo Menent
b57993e599
Merge remote-tracking branch 'upstream/develop' into develop
2018-10-19 08:36:12 +02:00
Mavyre
32a3779d23
Fixed all ressources displaying
2018-10-18 22:08:23 +02:00
Frédéric FRANCE
6c85fbbc30
add log and comment
2018-10-18 21:47:10 +02:00
Frédéric FRANCE
b0e24e2b8d
use strict comparaison
2018-10-18 21:24:06 +02:00
Laurent Destailleur
d4bc53660b
Code comment and debug filemanager
2018-10-18 21:22:30 +02:00
Frédéric FRANCE
256ee40d0a
Merge remote-tracking branch 'upstream/develop' into patch-16
2018-10-18 21:01:49 +02:00
Frédéric FRANCE
7012b7829f
Merge remote-tracking branch 'upstream/develop' into patch-23
2018-10-18 20:51:39 +02:00
Frédéric FRANCE
c4cc58443a
Merge remote-tracking branch 'upstream/develop' into patch-22
2018-10-18 20:50:03 +02:00
Frédéric FRANCE
5a9e49ef46
Merge remote-tracking branch 'upstream/develop' into patch-21
2018-10-18 20:48:01 +02:00
Frédéric FRANCE
69d3b274aa
Merge remote-tracking branch 'upstream/develop' into patch-20
2018-10-18 20:46:47 +02:00
Frédéric FRANCE
8dd7f62a77
Merge remote-tracking branch 'upstream/develop' into patch-19
2018-10-18 20:45:36 +02:00
Frédéric FRANCE
0f7b1a04d9
Merge remote-tracking branch 'upstream/develop' into patch-15
2018-10-18 20:42:52 +02:00
Frédéric FRANCE
3437943609
Merge remote-tracking branch 'upstream/develop' into patch-9
2018-10-18 20:41:36 +02:00
Frédéric FRANCE
300f80e914
Merge remote-tracking branch 'upstream/develop' into patch-18
2018-10-18 20:39:45 +02:00
Frédéric FRANCE
16211473d7
Merge remote-tracking branch 'upstream/develop' into patch-17
2018-10-18 20:36:43 +02:00
Laurent Destailleur
66cb06eca9
NEW Top menu is always on screen with MD theme.
2018-10-18 17:33:14 +02:00
atm-greg
db2937715d
create payment from loan schedule
2018-10-18 17:27:08 +02:00
atm-greg
f0849aaf81
schedule as a tab
2018-10-18 17:16:38 +02:00
Laurent Destailleur
05326e271d
FIX Filter on invoice type
2018-10-18 17:15:26 +02:00
atm-greg
ff92572d56
add insurance amount on loan
2018-10-18 17:03:49 +02:00
atm-quentin
cfba5a5e0f
fix when model mail selected
2018-10-18 17:02:20 +02:00
Laurent Destailleur
7cafdc4d9a
Fix phpcs
2018-10-18 16:56:43 +02:00
andreubisquerra
b396aaebc5
Fix delete without any selected line
2018-10-18 16:31:37 +02:00
atm-quentin
606011180b
renaming exp to rcp
2018-10-18 15:11:43 +02:00
atm-quentin
ba997a0d0f
FIX for mask
2018-10-18 14:48:20 +02:00
Juanjo Menent
52ad5c5565
New: works with variants:
...
-To edit child price and weight impacts better to see in tab the father price and weight
2018-10-18 12:21:39 +02:00
Juanjo Menent
c588f5e6c0
New: works with variants:
...
-Child label with combination labels
2018-10-18 10:55:27 +02:00
atm-quentin
eeb75bf650
FIX add object linked supplier order of reception
2018-10-18 10:26:32 +02:00
Juanjo Menent
6c76f9517f
New: works with variants:
...
-Child label with combination labels
2018-10-18 10:26:21 +02:00
Juanjo Menent
fd989230a4
New: works with variants:
...
-Child label change if parent changes
2018-10-18 09:09:42 +02:00
Laurent Destailleur
548fafc6e9
Fix trans
2018-10-18 01:32:06 +02:00
Laurent Destailleur
b2a7845c8a
Fix trans
2018-10-18 01:28:14 +02:00
Laurent Destailleur
63f4704725
Fix translation
2018-10-18 01:05:10 +02:00
Laurent Destailleur
52840478c0
Clean code
2018-10-17 21:11:07 +02:00
Frédéric FRANCE
db732ddedd
code comment
2018-10-17 20:36:45 +02:00
Frédéric FRANCE
ebc5cb5a96
do not trim int
2018-10-17 20:24:43 +02:00
Frédéric FRANCE
393303fe31
do not trim int
2018-10-17 20:17:43 +02:00
Frédéric FRANCE
47048baa36
do not trim int
2018-10-17 20:14:01 +02:00
Frédéric FRANCE
456bdb5b8c
do not trim int
2018-10-17 20:04:48 +02:00
atm-quentin
8ef7c29d19
FIX PDF Total Ordered
2018-10-17 17:17:11 +02:00
atm-greg
d86c44e641
Add conf to disable a thirdparty type
2018-10-17 15:55:46 +02:00
gauthier
aea7299970
FIX : use discount with multicurrency
2018-10-17 15:49:08 +02:00
atm-quentin
dd0a57d39e
FIX pdf for creating invoice without massaction
2018-10-17 15:36:47 +02:00
Laurent Destailleur
a66256a799
FIX Hover on the filemanager
2018-10-17 13:22:52 +02:00
atm-quentin
236a61ab55
new manage correctly create bills on reception
2018-10-17 11:56:32 +02:00
Ferran Marcet
ffde353441
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:06:06 +02:00
Ferran Marcet
bdae4e1c4d
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:04:42 +02:00
Ferran Marcet
b462e7b217
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:01:02 +02:00
Frédéric FRANCE
7d8ff04292
Update paiement.class.php
2018-10-17 08:15:12 +02:00
Alexandre SPANGARO
a466104b81
Fix FEC on transaction card
...
Fix for FEC compliance
- Remove useless column label_compte
- label_compte is generated with label of accounting account number
- Insert also the label of the journal
2018-10-17 07:20:04 +02:00
Alexandre SPANGARO
e614d33aa4
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-17 05:57:22 +02:00
ptibogxiv
f2d0004a3e
ADD civility list in API
2018-10-17 00:36:40 +02:00
Laurent Destailleur
3ef32a24a4
Look and feel
2018-10-17 00:34:39 +02:00
ptibogxiv
a77458cb36
Update facture.class.php
2018-10-17 00:07:21 +02:00
ptibogxiv
7c35eae202
Update commande.class.php
2018-10-17 00:06:24 +02:00
ptibogxiv
3fdf3c95b4
FIX harmony in date name with API
2018-10-17 00:04:44 +02:00
Frédéric FRANCE
70b6c502da
Update menubase.class.php
2018-10-16 23:36:00 +02:00
ptibogxiv
27b7cf8bea
Fix uniformization dates of order in API
2018-10-16 23:31:19 +02:00
Frédéric FRANCE
fa78ab7c66
do not trim int
2018-10-16 23:20:13 +02:00
Frédéric FRANCE
2e77b9fed9
fix phpunit
2018-10-16 22:42:18 +02:00
Frédéric FRANCE
cf1819ea0e
Update html.formmail.class.php
2018-10-16 22:27:34 +02:00
Alexandre SPANGARO
a5ebcff2ee
Fix lettering function
2018-10-16 22:27:34 +02:00
Frédéric FRANCE
2d542d028f
Update html.formmail.class.php
2018-10-16 22:22:57 +02:00
Frédéric FRANCE
4e14c2817c
add errors def to form class
2018-10-16 22:09:11 +02:00
Laurent Destailleur
00dc78dd01
Fix responsive
2018-10-16 21:58:33 +02:00
Frédéric FRANCE
f80de9e65e
fix syntax error and phpcs
2018-10-16 21:49:26 +02:00
Laurent Destailleur
74c74f9e2d
Merge pull request #9776 from ptibogxiv/patch-78
...
FIX call of bankaccount class
2018-10-16 21:43:51 +02:00
Laurent Destailleur
2ce1aaaebf
Update api_thirdparties.class.php
2018-10-16 21:43:40 +02:00
Laurent Destailleur
6a3597d9fd
Merge pull request #9774 from frederic34/datapolicy
...
cut long lines >500 to remove phpcs warning
2018-10-16 21:42:36 +02:00
Laurent Destailleur
e418090053
Merge pull request #9775 from aspangaro/9.0_accountancy
...
Fix FEC Missing some information in bookkeeping
2018-10-16 21:41:52 +02:00
Laurent Destailleur
192168cfa4
Merge pull request #9773 from ptibogxiv/patch-77
...
Delete dictionary in ticket API
2018-10-16 21:40:24 +02:00
Laurent Destailleur
550a66d338
Merge pull request #9772 from ptibogxiv/patch-76
...
NEW move ticket dictionary in API /setup
2018-10-16 21:39:30 +02:00
Laurent Destailleur
737bbf6e7c
Update api_setup.class.php
2018-10-16 21:38:27 +02:00
ptibogxiv
5e20390e15
FIX call of bankaccount class
2018-10-16 21:33:42 +02:00
Alexandre SPANGARO
eb4ffcf1a7
Fix FEC Missing some information in bookkeeping
2018-10-16 21:17:00 +02:00
Frédéric FRANCE
e2a6c9e332
cut long lines >500
2018-10-16 21:05:15 +02:00
ptibogxiv
0e6d3a0f48
FIX delete dictionnary in ticket API
2018-10-16 20:59:06 +02:00
ptibogxiv
c9aaf01a7c
MOVE ticket dictionnary in API /setup
2018-10-16 20:56:10 +02:00
Laurent Destailleur
58240c8f1c
Merge pull request #9767 from ptibogxiv/patch-74
...
NEW Save external payment IDs into table of payment
2018-10-16 20:32:23 +02:00
Laurent Destailleur
8d815c4e6b
Merge pull request #9766 from ptibogxiv/patch-73
...
ADD support of external modepayment
2018-10-16 20:30:24 +02:00
Laurent Destailleur
9959ba3662
Merge pull request #9761 from frederic34/patch-20
...
Update actioncomm.class.php
2018-10-16 20:29:15 +02:00
Laurent Destailleur
0ecf7986f8
Merge pull request #9771 from frederic34/patch-9
...
fix phpcs
2018-10-16 20:28:12 +02:00
Laurent Destailleur
57bb8bcfcd
Disabled action are hidden with reason
2018-10-16 20:27:33 +02:00
Frédéric FRANCE
a40271e475
Update bankjournal.php
2018-10-16 20:11:32 +02:00
Frédéric FRANCE
f470068d9d
fix phpcs
2018-10-16 20:10:13 +02:00
Laurent Destailleur
d43e1fcef6
Merge pull request #9729 from simnandez/develop
...
New: works with variants
2018-10-16 20:08:17 +02:00
Laurent Destailleur
33031450a3
Merge pull request #9747 from atm-maxime/fix_status_tobatch
...
Fix missing status_batch var on product lists #9606
2018-10-16 20:02:56 +02:00
Laurent Destailleur
f07096ea3a
Merge pull request #9760 from frederic34/patch-19
...
add errors def in htmlformsms
2018-10-16 20:01:41 +02:00
Laurent Destailleur
44d8333633
Fix external link must be after label
2018-10-16 20:00:53 +02:00
Laurent Destailleur
97273ff746
Merge pull request #9768 from ptibogxiv/patch-75
...
Add source link in stripe
2018-10-16 19:50:11 +02:00
Laurent Destailleur
78d7ea459d
Update paymentmodes.php
2018-10-16 19:49:16 +02:00
Laurent Destailleur
eaa759fd68
Merge pull request #9759 from frederic34/patch-15
...
add errors def in mailman class
2018-10-16 19:46:42 +02:00
Laurent Destailleur
d56c237d4e
Merge pull request #9756 from atm-maxime/fix_refused_proposal_in_total
...
Fix refused proposals were counted in totals in project overview
2018-10-16 19:46:19 +02:00
Laurent Destailleur
7cd8b36cea
Merge pull request #9755 from atm-greg/fix_massaction_delete_tasks
...
FIX modify parenting before task deletion
2018-10-16 19:45:43 +02:00
Laurent Destailleur
51896757f6
Merge pull request #9752 from frederic34/patch-18
...
Update adherent.class.php
2018-10-16 19:44:24 +02:00
Laurent Destailleur
ae76891853
Merge pull request #9751 from frederic34/patch-17
...
Update bookkeeping.class.php
2018-10-16 19:44:07 +02:00
Laurent Destailleur
d57e55387d
Merge branch 'develop' into payloan
2018-10-16 19:43:34 +02:00
Laurent Destailleur
f1c85cb36d
Merge pull request #9757 from frederic34/patch-9
...
do not trim int
2018-10-16 19:37:07 +02:00
Laurent Destailleur
575038d3a3
Merge pull request #9769 from atm-ph/fix_7.0_list_duplicate_extrafield_value
...
Fix list from 'Contacts/Addresses' on company may show duplicate valu…
2018-10-16 19:36:37 +02:00
Laurent Destailleur
63c79f23d6
Merge pull request #9749 from aspangaro/9.0_accountancy
...
Fix FEC Missing some information on bookeeping
2018-10-16 19:35:14 +02:00
Laurent Destailleur
f0c0c4779b
Fix remove yellow alert
2018-10-16 19:32:35 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018
...
Standardize and update code
2018-10-16 19:30:19 +02:00
Laurent Destailleur
5a4338ad1d
Revert "FIX and dolibarize"
2018-10-16 19:20:51 +02:00
Laurent Destailleur
a7c94ea068
Merge pull request #9764 from ptibogxiv/patch-71
...
FIX and dolibarize
2018-10-16 19:19:13 +02:00
Laurent Destailleur
605a7896cf
Merge pull request #9744 from atm-maxime/fix_numbering_supplier_credit_note
...
Fix numbering of supplier credit notes (issue #9624 )
2018-10-16 19:17:47 +02:00
Laurent Destailleur
2c1e8d6535
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Laurent Destailleur
08fa0deb24
FIX Bad label on delete button
2018-10-16 18:41:50 +02:00
atm-ph
72dd182b1f
Fix list from 'Contacts/Addresses' on company may show duplicate value for extrafields
2018-10-16 18:22:43 +02:00
Laurent Destailleur
502c52b78f
Show real path of module if not into custom
2018-10-16 18:09:43 +02:00
ptibogxiv
2cf87db10a
Add source link in stripe
2018-10-16 17:59:58 +02:00
Laurent Destailleur
f5029bf52b
Fix template
2018-10-16 17:46:14 +02:00
atm-quentin
e3a0a5e4f5
add fil element on list
2018-10-16 17:22:27 +02:00
ptibogxiv
00f839e8b4
add external modepayment in payment
2018-10-16 16:57:16 +02:00
ptibogxiv
d377fc26b4
ADD support of external modepayment
2018-10-16 16:55:25 +02:00
ptibogxiv
dc0aaf48d7
FIX and dolibarize
2018-10-16 16:08:20 +02:00
Laurent Destailleur
4bdcb17694
Trans
2018-10-16 15:38:26 +02:00
Philippe GRAND
bd3315528e
add links and highlight relevant text
2018-10-16 15:08:06 +02:00
atm-quentin
354825d006
NEW modele pdf canelle_reception to display linked reception to line
2018-10-16 14:58:56 +02:00
Philippe GRAND
059c72c678
add links and highlight relevant text
2018-10-16 14:55:29 +02:00
Philippe GRAND
5f37e07540
add links and highlight relevant text
2018-10-16 14:42:36 +02:00
Philippe GRAND
729ff0b9bb
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-16 14:20:11 +02:00
atm-quentin
a7f3d066e8
add error on create bills massaction
2018-10-16 12:19:48 +02:00
atm-quentin
f11e1940fc
NEW mass action list reception create bills for validated reception
2018-10-16 12:05:28 +02:00
Alexandre SPANGARO
a6e000ec79
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-16 06:33:46 +02:00
Alexandre SPANGARO
a971a2afe6
Fix FEC
2018-10-16 06:32:55 +02:00
Laurent Destailleur
70366e9d91
Missing translation
2018-10-16 03:31:33 +02:00
Laurent Destailleur
35f9371343
Fix missing es translation string
2018-10-16 03:30:17 +02:00
Laurent Destailleur
12cb60040b
Fix multilang
2018-10-16 01:52:22 +02:00
Laurent Destailleur
c8607a74bf
Load websitepage
2018-10-16 01:39:04 +02:00
Frédéric FRANCE
cab9c81ce2
Update actioncomm.class.php
2018-10-15 21:53:54 +02:00
Alexandre SPANGARO
3a6824da68
Fix FEC Missing label_compte & label_operation
2018-10-15 21:50:05 +02:00
Laurent Destailleur
568197656f
Fix canonical of home
2018-10-15 21:43:01 +02:00
Laurent Destailleur
c246ef38c0
Fix canonical
2018-10-15 21:42:43 +02:00
Frédéric FRANCE
9133d97e33
add errors def in htmlformsms
2018-10-15 21:40:27 +02:00
Frédéric FRANCE
00fdf9d3fd
Update mailmanspip.class.php
2018-10-15 21:32:27 +02:00
Frédéric FRANCE
aa20d6d359
add errors def in mailman class
2018-10-15 21:30:57 +02:00
Frédéric FRANCE
2e6f0d3d19
clean loan code
2018-10-15 20:40:59 +02:00
Frédéric FRANCE
7ea4f7ea0b
clean loan code
2018-10-15 20:36:11 +02:00
Alexandre SPANGARO
47305f5b0b
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-15 20:06:02 +02:00
Frédéric FRANCE
7492d42ad8
do not trim int
2018-10-15 18:47:12 +02:00
Laurent Destailleur
96ddebad4a
Set canonical tag
2018-10-15 17:48:39 +02:00
atm-quentin
83c8a78628
NEW auto event msg
2018-10-15 17:08:28 +02:00
Maxime Kohlhaas
dfe239bf8d
Fix refused proposals were counted in totals in project overview
2018-10-15 16:58:53 +02:00
Laurent Destailleur
743d4d7c01
NEW add option PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT
2018-10-15 16:40:40 +02:00
Laurent Destailleur
970c581bc9
css
2018-10-15 16:40:07 +02:00
Laurent Destailleur
6d4d8a0342
Dolibarize data privacy policy module
2018-10-15 14:05:54 +02:00
Juanjo Menent
194b3478f3
Merge remote-tracking branch 'upstream/develop' into develop
...
# Conflicts:
# htdocs/product/class/product.class.php
2018-10-15 13:40:42 +02:00
Laurent Destailleur
a20498126a
Fix init var
2018-10-15 13:40:22 +02:00
Laurent Destailleur
4cd7119d1c
Not used var
2018-10-15 13:38:50 +02:00
Laurent Destailleur
5d9b770511
phpcs
2018-10-15 13:32:09 +02:00
Laurent Destailleur
df4b3b09d2
Fix var not defined
2018-10-15 13:30:07 +02:00
Laurent Destailleur
cca87f3d5a
Fix phpcs
2018-10-15 13:27:17 +02:00
Laurent Destailleur
6ab037c766
Fix code comment
2018-10-15 13:26:18 +02:00
Laurent Destailleur
f59dba66e7
Fix phpcs
2018-10-15 13:23:35 +02:00
Juanjo Menent
58cc9aa918
Fix: found 1 blank lines before brace
2018-10-15 12:45:40 +02:00
atm-greg
06477b40a0
modify parenting before task deletion
2018-10-15 12:34:14 +02:00
Juanjo Menent
c2814948fb
Fix: name of fields used into the search criteria must always start with "search_"
2018-10-15 11:48:55 +02:00
Juanjo Menent
e3643c7ab7
Merge remote-tracking branch 'upstream/develop' into develop
2018-10-15 11:44:50 +02:00
Laurent Destailleur
2684767b19
Fix pagination
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
2018-10-15 11:08:40 +02:00
Laurent Destailleur
e29fb85cec
Fix limit
2018-10-15 11:07:16 +02:00
Laurent Destailleur
aa6996e2d0
Fix pagination show two times the same account on balance of accounts
2018-10-15 11:07:07 +02:00
Laurent Destailleur
9afc53ca06
Fix remove step in accountancy if module expense report not used
2018-10-15 11:05:20 +02:00
Laurent Destailleur
47d98ab69d
FIX content lost when editing a label with "
2018-10-15 11:05:04 +02:00
Laurent Destailleur
30072a98e9
FIX content lost when editing a label with "
2018-10-15 11:04:29 +02:00
Frédéric FRANCE
5e7a330f16
Update adherent.class.php
2018-10-15 08:53:47 +02:00
Frédéric FRANCE
425e26ecb6
Update bookkeeping.class.php
2018-10-15 08:46:41 +02:00
Frédéric FRANCE
4d6d3afbea
code comment
2018-10-15 08:39:46 +02:00
Alexandre SPANGARO
c8b9c11a01
Fix FEC Missing some subledger label on bookeeping
2018-10-15 06:53:48 +02:00
Alexandre SPANGARO
c6163a389b
Revert "Remove MAIN_FEATURES_LEVEL > 1 on fiscal year access"
...
This reverts commit 65e6b49abb
2018-10-15 06:22:28 +02:00
Laurent Destailleur
0a8f305151
Trans
2018-10-15 02:40:49 +02:00
Laurent Destailleur
c881be847d
Fix remove step in accountancy if module expense report not used
2018-10-15 01:47:44 +02:00
Laurent Destailleur
35eeb32f5d
Fix pagination
2018-10-15 00:08:28 +02:00
Laurent Destailleur
b13d9650f2
Fix pagination
2018-10-15 00:06:16 +02:00
Laurent Destailleur
995f4fa35f
Fix limit
2018-10-14 23:57:07 +02:00
Laurent Destailleur
8fc73d1b1b
Fix pagination show two times the same account on balance of accounts
2018-10-14 23:47:38 +02:00
Laurent Destailleur
ab807ada07
Work on translation
2018-10-14 23:26:57 +02:00
Laurent Destailleur
ac143b28ae
Work on multilang
2018-10-14 20:54:28 +02:00
Laurent Destailleur
45860b2494
Work on multilang
2018-10-14 20:04:25 +02:00
Maxime Kohlhaas
af813f8214
Fix missing status_batch var on product lists #9606
2018-10-14 19:55:25 +02:00
Laurent Destailleur
b0569de166
Work on multilang support
2018-10-14 18:44:29 +02:00
Maxime Kohlhaas
c66823d72f
Fix numbering of supplier credit notes (issue #9624 )
2018-10-14 17:07:38 +02:00
Laurent Destailleur
7e68d8df1b
Update product.class.php
2018-10-14 16:47:30 +02:00
Laurent Destailleur
5654492ba8
Update product.class.php
2018-10-14 16:45:45 +02:00
Laurent Destailleur
db2e1e09e7
Merge branch 'develop' into patch-112
2018-10-14 16:44:36 +02:00
Laurent Destailleur
abf8867061
Merge pull request #8207 from atm-john/New_invoice_default_documents
...
NEW hidden option to define an invoice template for each invoice type
2018-10-14 16:36:37 +02:00
Laurent Destailleur
747a2a8ae0
Merge pull request #9741 from frederic34/preparehead
...
fix standard prepare_head
2018-10-14 16:28:02 +02:00
Maxime Kohlhaas
d4d921b1cc
Add massaction generate on main lists
2018-10-14 16:27:59 +02:00
Laurent Destailleur
fabc11191d
Merge pull request #9739 from frederic34/patch-11
...
fix size of $head when replacing by hook
2018-10-14 16:27:14 +02:00
Laurent Destailleur
f9a66a34d0
Merge pull request #9738 from frederic34/patch-9
...
fix doc in import.lib.php
2018-10-14 16:24:47 +02:00
Laurent Destailleur
6aa70e8933
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-14 16:10:13 +02:00
Laurent Destailleur
96d2950051
Better tooltip
2018-10-14 16:10:02 +02:00
Laurent Destailleur
e91ce6e3c5
Merge pull request #9737 from aspangaro/9.0_FEC
...
Debug FEC model export
2018-10-14 16:07:28 +02:00
Maxime Kohlhaas
9be8c579d0
New massaction to generate PDF
2018-10-14 15:50:55 +02:00
Laurent Destailleur
278910b66b
Fix website
2018-10-14 14:26:18 +02:00
Laurent Destailleur
26c9158ed7
Label of DPO
2018-10-14 14:20:28 +02:00
Philippe GRAND
eecc56c1a3
highlight relevant text
2018-10-14 13:00:01 +02:00
Philippe GRAND
b2677f08a4
add links for set-up
2018-10-14 12:47:26 +02:00
Frédéric FRANCE
65c69c4564
fix standard prepare_head
2018-10-14 10:57:27 +02:00
Frédéric FRANCE
787658ac98
reduce complexity of payments.lib.php
2018-10-14 10:56:03 +02:00
Frédéric FRANCE
70a98743e8
Update functions.lib.php
2018-10-14 10:48:06 +02:00
Frédéric FRANCE
1f1a614b47
Update import.lib.php
2018-10-14 10:21:06 +02:00
Philippe GRAND
5dd447445a
html5
2018-10-14 09:43:33 +02:00
Alexandre SPANGARO
65e6b49abb
Remove MAIN_FEATURES_LEVEL > 1 on fiscal year access
2018-10-14 08:08:55 +02:00
Alexandre SPANGARO
d9e1312924
Debug FEC model export
2018-10-14 06:16:14 +02:00
Laurent Destailleur
e19453450d
Fix closing tag
2018-10-13 19:57:34 +02:00
Laurent Destailleur
532e05c42e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2018-10-13 14:29:51 +02:00
Laurent Destailleur
c15505bc13
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-13 14:27:50 +02:00
Laurent Destailleur
8779d3043f
css
2018-10-13 14:22:26 +02:00
Laurent Destailleur
1ca3a41f4f
Fix login
2018-10-13 14:16:42 +02:00
Laurent Destailleur
1e58b837f0
css
2018-10-13 14:11:44 +02:00
Laurent Destailleur
8a928a72fa
Sync transifex
2018-10-13 14:03:32 +02:00
Philippe GRAND
19ff02646e
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-13 13:47:35 +02:00
Laurent Destailleur
31152e10f6
Trans
2018-10-13 13:27:59 +02:00
Philippe GRAND
effd11e1f9
translation
2018-10-13 12:42:01 +02:00
Philippe GRAND
94ea438881
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-13 12:40:28 +02:00
Laurent Destailleur
76e6968a21
Merge pull request #9730 from atm-ph/fix_7.0_extrafield_date_not_show
...
Fix extrafield contact typed as date isn't show in the list from 'con…
2018-10-13 12:03:07 +02:00
Laurent Destailleur
e5cc4ae61b
Code comment
2018-10-13 12:00:59 +02:00
Philippe GRAND
30630ff368
fix typo
2018-10-13 11:58:19 +02:00
Philippe GRAND
d98ebbd9ee
Standardize and update code
2018-10-13 10:39:27 +02:00
Philippe GRAND
9551cb12f5
Standardize and update code
2018-10-13 09:59:33 +02:00
Philippe GRAND
d8b62f0808
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-13 09:49:23 +02:00
atm-ph
7b17b453bf
Fix sort and switch page
2018-10-12 23:29:35 +02:00
atm-ph
23e4cd57f3
Fix warnings PHP7
2018-10-12 23:27:38 +02:00
Frédéric FRANCE
0f8ac57c85
remove var_dump
2018-10-12 22:34:23 +02:00
atm-ph
e2748953c3
Fix print extrafield date in list
2018-10-12 22:31:47 +02:00
Laurent Destailleur
87f744896d
Merge pull request #9733 from ATM-Marc/FIX_6.0_propal_customcode
...
FIX: propal pdf: missing parenthesis for customs code
2018-10-12 21:14:40 +02:00
Laurent Destailleur
b78932b9f7
Prepare 7.0.5
2018-10-12 21:11:40 +02:00
Laurent Destailleur
1e635cff1b
Fix new stripe API
2018-10-12 21:00:33 +02:00
Laurent Destailleur
2bbf9a3429
Hide feature that need re-engeneering
2018-10-12 20:37:59 +02:00
Laurent Destailleur
d8edb1f6b8
Fix regression in online payment
2018-10-12 20:28:26 +02:00
Laurent Destailleur
83642ffa4d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-12 20:19:51 +02:00
Philippe GRAND
bdb09a7f43
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-12 19:26:00 +02:00
Laurent Destailleur
6a363fd1ab
API Stripe 2018-09-24
2018-10-12 19:26:00 +02:00
Laurent Destailleur
f332dc1cef
Merge branch 'develop' into patch-40
2018-10-12 19:15:43 +02:00
Laurent Destailleur
0f3ac26006
Merge pull request #9319 from ptibogxiv/patch-41
...
Fix for new stripe API 2018-09-24
2018-10-12 19:14:58 +02:00
Laurent Destailleur
afa45cd28e
Merge pull request #9320 from ptibogxiv/patch-42
...
Update Stripe API version
2018-10-12 19:14:22 +02:00
Philippe Grand
7e82e3d44c
Update card.php
2018-10-12 19:13:07 +02:00
Laurent Destailleur
067b29c9f8
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-12 19:09:45 +02:00
Laurent Destailleur
9f27dd41e5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2018-10-12 19:08:06 +02:00
Philippe GRAND
9e494e65e0
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-12 19:04:02 +02:00
Laurent Destailleur
d4b02c0552
Release 6.0.8
2018-10-12 19:03:03 +02:00
Laurent Destailleur
2d2b9a030c
Fix app name to match Stripe advice
2018-10-12 19:01:01 +02:00
Laurent Destailleur
60a5444c14
Fix app name to match Stripe advice
2018-10-12 18:50:33 +02:00
Marc de Lima Lucio
afd9b4ea1a
FIX: propal pdf: missing parenthesis for customs code
2018-10-12 18:19:17 +02:00
Laurent Destailleur
ef820e4c55
Merge pull request #9726 from fgarcia78/develop
...
FIX translatable field name in stock movement table
2018-10-12 17:52:52 +02:00
Laurent Destailleur
a2aa491c51
Merge pull request #9728 from atm-john/8.0_Fix_count_error
...
Fix count on no countable object
2018-10-12 17:52:30 +02:00
Laurent Destailleur
1ab6cd4b59
Update card.php
2018-10-12 17:51:32 +02:00
Laurent Destailleur
8c843fdccd
Merge pull request #9727 from atm-john/fix_situation_prev_percent
...
FIX situation prev percent
2018-10-12 17:49:24 +02:00
Laurent Destailleur
062d8a4bdb
Merge pull request #9724 from Librethic/fix_position_email_template
...
FIX : position 0 for emails templates
2018-10-12 17:48:52 +02:00
Laurent Destailleur
f4b15612fc
Merge pull request #9723 from atm-greg/New_save_documents
...
NEW save archive of full documents directory
2018-10-12 17:47:50 +02:00
Laurent Destailleur
f94628f43c
Merge pull request #9717 from bafbes/abb80033
...
Fix: Undeclared global variable
2018-10-12 17:41:45 +02:00
Laurent Destailleur
99fde00902
Merge pull request #9719 from frederic34/patch-11
...
do not trim int
2018-10-12 17:35:04 +02:00
Philippe GRAND
18b3238bad
Standardize and update code
2018-10-12 16:56:01 +02:00
Philippe GRAND
1cfb06934c
Standardize and update code
2018-10-12 16:49:53 +02:00
Philippe GRAND
bd426d1052
Standardize and update code
2018-10-12 16:44:25 +02:00
Philippe GRAND
4df574d58e
Standardize and update code
2018-10-12 16:23:27 +02:00
Philippe GRAND
c5edb3289b
Standardize and update code
2018-10-12 16:09:05 +02:00
Philippe GRAND
181c1e0b77
Standardize and update code
2018-10-12 16:01:27 +02:00
Philippe GRAND
9d4f6dc444
Standardize and update code
2018-10-12 15:55:36 +02:00
Philippe GRAND
ba40ad4aab
Standardize and update code
2018-10-12 12:23:45 +02:00
Philippe GRAND
b4e2542472
Standardize and update code
2018-10-12 12:20:05 +02:00
Philippe GRAND
995e9b4f55
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-12 12:16:57 +02:00
Laurent Destailleur
53b099858f
FIX cutomer or supplier categories visible or not when required
2018-10-12 12:04:04 +02:00
Laurent Destailleur
82c89f739d
social network module
2018-10-12 11:29:47 +02:00
Laurent Destailleur
cb53e18aa4
Social network module
2018-10-12 11:19:18 +02:00
Laurent Destailleur
ded5c4c3dd
Social network module
2018-10-12 11:02:03 +02:00
Philippe GRAND
7e6cdfb5ec
Standardize and update code
2018-10-12 09:34:54 +02:00
Philippe GRAND
357173f0ef
Standardize and update code
2018-10-12 09:30:53 +02:00
Philippe GRAND
849a1a9400
Standardize and update code
2018-10-12 09:26:58 +02:00
atm-quentin
3e29b11890
NEW add field list if reception
2018-10-11 17:30:14 +02:00
atm-ph
79420593f4
Fix display 0 (as virtual stock) instead of empty string
2018-10-11 17:14:22 +02:00
Juanjo Menent
0976616401
Fix: Opening brace should be on a new line
2018-10-11 17:13:39 +02:00
Juanjo Menent
ab55ff2e2c
New: works with variants:
...
- Make the checkbox working correctly
2018-10-11 15:44:23 +02:00
atm-quentin
83e4d6bd13
NEW export reception
2018-10-11 15:28:28 +02:00
atm-quentin
4b23b46e48
NEW workflow set reception billed on validate supplier bill
2018-10-11 14:49:19 +02:00
atm-ph
4b32c8e100
Fix extrafield contact typed as date isn't show in the list from 'contact/address' tab of company
2018-10-11 14:24:55 +02:00
Laurent Destailleur
e6f179b6cb
Fix look
2018-10-11 13:33:44 +02:00
Laurent Destailleur
88ff7241f5
FIX Quick hack to solve pb of bad definition of public holidays
2018-10-11 13:12:36 +02:00
Juanjo Menent
58be4ac7a3
New: works with variants:
...
- Hide child products into list if PRODUIT_ATTRIBUTES_HIDECHILD is activated
2018-10-11 12:36:10 +02:00
atm-quentin
1c33714091
FIX remplir vider
2018-10-11 12:18:14 +02:00
Juanjo Menent
2ef0e95586
New: works with variants:
...
- If product is parent showing stock of childs and not itself
- Add function hasVariants for know if product has variants
2018-10-11 12:08:50 +02:00
Laurent Destailleur
e1e1599a6d
FIX shared link ko on proposals
2018-10-11 11:59:14 +02:00
Laurent Destailleur
ced4038443
FIX qty not visible for a lot when making shipment on a dedicated stock
2018-10-11 11:56:52 +02:00
John BOTELLA
92686100b2
Fix count on no countable object
2018-10-11 10:51:54 +02:00
John BOTELLA
ee225a2b8b
FIX situation prev percent
2018-10-11 10:14:22 +02:00
atm-quentin
07e4cab2fc
set back status
2018-10-11 10:00:07 +02:00
Philippe GRAND
c264688635
Standardize and update code
2018-10-11 09:53:36 +02:00
Philippe GRAND
dd515c9cac
Standardize and update code
2018-10-11 09:22:03 +02:00
Philippe GRAND
f13c38e117
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-11 09:14:40 +02:00
Fernando Octavio García López
c7eb935cb8
FIX Fixed translatable field name in stock movement table
2018-10-10 22:57:08 -06:00
Laurent Destailleur
cf88de05e2
NEW Add format code into exported filename
2018-10-10 20:01:01 +02:00
Laurent Destailleur
6c55bfc0f7
Fix export and remove duplicate csv export.
2018-10-10 19:45:26 +02:00
Laurent Destailleur
8d9f6aad3f
css
2018-10-10 19:20:10 +02:00
Laurent Destailleur
4a80a4d9e7
css
2018-10-10 19:18:33 +02:00
Laurent Destailleur
5cb111e339
css
2018-10-10 19:13:00 +02:00
Laurent Destailleur
9f4cee5fb7
css
2018-10-10 19:11:37 +02:00
Laurent Destailleur
b13088849b
CSS
2018-10-10 18:58:28 +02:00
Laurent Destailleur
619ac9c7cf
Fix help
2018-10-10 18:42:53 +02:00
Laurent Destailleur
7f1aa217a6
Fix link
2018-10-10 18:38:53 +02:00
Laurent Destailleur
82e06eda75
FIX save search criteria when going on receipt from bank transaction
2018-10-10 18:33:32 +02:00
jfefe
8fc4e2066f
FIX : position 0 for emails templates
...
Closes #9548 #8737 #9478
2018-10-10 18:18:02 +02:00
atm-quentin
2d8016c722
Merge branch 'NEW_reception_module' of github.com:atm-quentin/dolibarr into NEW_reception_module
2018-10-10 17:31:12 +02:00
atm-quentin
aeceea2d26
FIX index.php
2018-10-10 17:30:44 +02:00
Laurent Destailleur
62a6af3288
phpcs
2018-10-10 17:02:35 +02:00
Laurent Destailleur
fcf62744d7
Add ref in description
2018-10-10 16:23:00 +02:00
Laurent Destailleur
1204fb1e74
Fix online payments use id instead of ref into TAG
2018-10-10 16:16:17 +02:00
root
da1ca5f074
FIX commandedet to commandefourndet
2018-10-10 15:47:34 +02:00
atm-quentin
aaace60b0d
FIX stock movement on close reception and set status if too much receive$
2018-10-10 15:33:35 +02:00
atm-greg
2d395b23c4
fix for travis
2018-10-10 14:35:25 +02:00
root
42a1982ded
FIX script
2018-10-10 14:23:57 +02:00
atm-greg
6eeb860514
delete useless code
2018-10-10 14:09:38 +02:00
atm-greg
24988f075c
Add archive generation for documents directory
2018-10-10 14:01:20 +02:00
Laurent Destailleur
eff0e959b3
Fix duplicate column
2018-10-10 13:06:54 +02:00
Laurent Destailleur
6446343e1b
Fix sort lost
2018-10-10 13:05:19 +02:00
Laurent Destailleur
cb29209457
NEW Enhancement in process to make manual bank conciliation
2018-10-10 12:47:18 +02:00
atm-quentin
489ccc3c49
NEW list and fix conf
2018-10-10 12:19:57 +02:00
Laurent Destailleur
562ee1cb64
FIX checkbox to conciliate not visible if bank receipt nb known
2018-10-10 12:19:22 +02:00
Philippe GRAND
9b6367c1ee
Standardize and update code
2018-10-10 12:16:20 +02:00
Philippe GRAND
b2826966e4
Standardize and update code
2018-10-10 11:30:33 +02:00
Laurent Destailleur
2b33e2a9c5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-10 10:52:58 +02:00
Laurent Destailleur
40f89d138f
Fix height of confirm popup
2018-10-10 10:52:29 +02:00
Philippe GRAND
15fee54975
Standardize and update code
2018-10-10 09:23:55 +02:00
Philippe GRAND
c2f73ddf13
Standardize and update code
2018-10-10 09:20:50 +02:00
Philippe GRAND
90cb6150c4
Standardize and update code
2018-10-10 09:16:01 +02:00
Philippe GRAND
69379dc2bb
Standardize and update code
2018-10-10 09:12:25 +02:00
Philippe GRAND
62c602e821
Standardize and update code
2018-10-10 08:50:23 +02:00
Laurent Destailleur
e2e935e713
Fix scrutinizer bugs
2018-10-10 02:01:13 +02:00
Laurent Destailleur
8f4b74733c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2018-10-10 01:51:54 +02:00
Laurent Destailleur
414876e25e
More complete message
2018-10-10 01:46:43 +02:00
Laurent Destailleur
d75828567c
Fix amount last subscription
2018-10-10 01:44:56 +02:00
Laurent Destailleur
b1289632e0
CSS
2018-10-10 01:27:31 +02:00
Laurent Destailleur
b73a2a24ef
FIX Tooltip on invoice widget
2018-10-10 01:16:53 +02:00
Laurent Destailleur
2539f0047f
FIX Sending of reminder for expired subscriptions
2018-10-09 23:10:39 +02:00
Laurent Destailleur
df0ec95b22
Code comment and better error message
2018-10-09 21:21:10 +02:00
Frédéric FRANCE
03fcc2f088
Update paymentvarious.class.php
2018-10-09 20:31:14 +02:00
Frédéric FRANCE
b917fd0cf2
do not trim int
2018-10-09 19:41:53 +02:00
Frédéric FRANCE
c3f07dd2e0
define $code for all execution paths
2018-10-09 19:28:52 +02:00
Abbes Bahfir
8160dcec6a
Fix: Undeclared global variable
2018-10-09 16:10:49 +01:00
Laurent Destailleur
9fe3e7b6c0
Fix phpunit
2018-10-09 17:09:33 +02:00
Laurent Destailleur
1d04ce2185
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-10-09 17:07:32 +02:00
Laurent Destailleur
01c32525df
Merge
2018-10-09 17:06:08 +02:00
atm-quentin
66093343b8
FIX linkedobjectblock tpl
2018-10-09 17:05:45 +02:00
Laurent Destailleur
84605bc59b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-09 16:59:47 +02:00
Laurent Destailleur
dc498173c8
Code comment
2018-10-09 16:58:55 +02:00
Laurent Destailleur
430f833222
Merge pull request #9626 from OPEN-DSI/fix_product_margin
...
FIX Product margin tab and credit note
2018-10-09 16:57:08 +02:00
Laurent Destailleur
c401739fed
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-09 16:28:03 +02:00
atm-quentin
7ad4a7e384
NEW creation facture fourn depuis reception
2018-10-09 16:26:40 +02:00
Laurent Destailleur
b4b82ce3d6
Drop both contraint and index
2018-10-09 16:25:57 +02:00
Laurent Destailleur
62319018dd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-09 16:19:56 +02:00
Laurent Destailleur
bd8cf3d81e
Merge pull request #9704 from atm-gauthier/7.0_fix_userlist
...
FIX : when we're just admin and not super admin, if we create new use…
2018-10-09 16:17:49 +02:00
Laurent Destailleur
bde5ee1232
Merge pull request #9621 from ptibogxiv/patch-69
...
Prepare for more stripe function
2018-10-09 16:15:23 +02:00
Laurent Destailleur
b68f6c0fca
Use more generic name
2018-10-09 16:15:12 +02:00
Laurent Destailleur
422af361b4
Merge pull request #9622 from ptibogxiv/patch-68
...
Prepare for more stripe function
2018-10-09 16:14:35 +02:00
Laurent Destailleur
65b48b06d9
Update llx_paiement.sql
2018-10-09 16:14:28 +02:00
Laurent Destailleur
4fc1f3be4a
Merge pull request #9716 from grandoc/new_branch_09_10_2018
...
Standardize and update code
2018-10-09 16:07:43 +02:00
Laurent Destailleur
69b33199da
Merge pull request #9714 from homer8173/patch-3
...
Fix log bookmark create
2018-10-09 16:07:15 +02:00
Laurent Destailleur
0fbc9d640e
Fix syntax error
2018-10-09 16:05:56 +02:00
Laurent Destailleur
5d2f34dc1e
Merge pull request #9715 from inoveaconseil/datapolicies
...
Dolibarization DataPolicies
2018-10-09 16:03:14 +02:00
Philippe GRAND
52369bcb2b
Standardize and update code
2018-10-09 15:46:10 +02:00
Philippe GRAND
9dadd5212d
Merge remote-tracking branch 'upstream/develop' into new_branch_09_10_2018
2018-10-09 15:45:07 +02:00
Philippe GRAND
e9bd1be41b
Standardize and update code
2018-10-09 15:38:42 +02:00
Laurent Destailleur
46ad7de5dd
Merge pull request #9709 from bafbes/abb80031
...
NEW Category filter on user list
2018-10-09 15:38:00 +02:00
Laurent Destailleur
dfe9c05d2f
Merge menu entry for tags/categories as submenu of element.
2018-10-09 15:26:15 +02:00
Laurent Destailleur
0938ac4afa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/list.php
2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-09 14:53:39 +02:00
Laurent Destailleur
387d9d685a
Update auguria menu
2018-10-09 14:52:53 +02:00
Laurent Destailleur
dd0cbabc91
Fix translation
2018-10-09 14:44:13 +02:00
Laurent Destailleur
9bea9edfd7
FIX Menu to show/edit Users categories was missing
2018-10-09 14:41:21 +02:00
Inovea Conseil
768ab66d1f
Datapolicies
2018-10-09 14:40:15 +02:00
Laurent Destailleur
a2a53a32f1
FIX Look and feel v8. Missing button "Create category"
2018-10-09 14:34:25 +02:00
Abbes Bahfir
073914572c
Fix: users categories type is Categorie::TYPE_USER
2018-10-09 14:24:41 +02:00
Laurent Destailleur
966e97617d
Merge pull request #9708 from bafbes/abb80030
...
FIX users categories type is Categorie::TYPE_USER
2018-10-09 14:24:21 +02:00
Laurent Destailleur
f365a987c4
FIX restore last seach criteria
...
FIX filter on employee
2018-10-09 14:20:53 +02:00
Abbes Bahfir
603c70ffc7
Fix: Searching on employee field disables employee mode
2018-10-09 14:10:04 +02:00
Laurent Destailleur
362c226ad6
Merge pull request #9710 from bafbes/abb80032
...
Fix: Searching on employee field disables employee mode
2018-10-09 14:09:23 +02:00
Laurent Destailleur
f3647c45e6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-09 14:06:56 +02:00
Laurent Destailleur
4d959bbea7
Fix consistency of label of proposal status
2018-10-09 14:06:45 +02:00
Laurent Destailleur
94743d50be
Merge pull request #9707 from aspangaro/9.0_FEC
...
NEW Add FEC Export in accountancy
2018-10-09 13:05:20 +02:00
Norbert Penel
aa4f57e888
Fix log bookmark create
...
bad log message
2018-10-09 12:53:45 +02:00
Laurent Destailleur
6a1610cdef
Merge pull request #9705 from ebzao/patch-1
...
fix bank ref override "bordereau cheque" ref
2018-10-09 12:44:18 +02:00
Laurent Destailleur
bc4ddce314
Merge pull request #9713 from frederic34/patch-9
...
Update index.php
2018-10-09 12:43:32 +02:00
Laurent Destailleur
398603c789
Merge pull request #9696 from IAS-SYSTEMS-CSC/develop
...
new malay lang tag
2018-10-09 12:40:26 +02:00
Frédéric FRANCE
b615d03b0b
Update index.php
2018-10-09 12:17:51 +02:00
atm-quentin
9f56540e75
NEW actions buttons done with stock movement
2018-10-09 11:33:41 +02:00
Philippe GRAND
af0bcb2631
Standardize code
2018-10-09 09:40:00 +02:00
Philippe GRAND
6ea115f828
Standardize code
2018-10-09 09:04:27 +02:00
Philippe GRAND
6a6df629b2
Standardize code
2018-10-09 08:56:58 +02:00
Philippe GRAND
ac214a7258
Standardize code
2018-10-09 08:53:08 +02:00
Philippe GRAND
bba6669f03
Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018
2018-10-09 08:47:26 +02:00
Laurent Destailleur
1c74dcc270
NEW Can filter on EEC, not EEC, etc... in binding step of accountancy
2018-10-09 01:47:37 +02:00
Abbes Bahfir
34da7cc731
Fix: Searching on employee field disables employee mode
2018-10-09 00:25:55 +01:00
Laurent Destailleur
6ded9e843d
NEW The binding step in accountancy has a country filter like a combo
2018-10-09 01:03:46 +02:00
Abbes Bahfir
06a943fc80
Fix: Category filter on user list
2018-10-09 00:02:14 +01:00
Abbes Bahfir
1e706c2e6b
Fix: users categories type is Categorie::TYPE_USER
2018-10-08 23:50:14 +01:00
Laurent Destailleur
35d5a495de
Save pos_source with id of POS station
2018-10-08 22:51:20 +02:00
Laurent Destailleur
41f2289ffa
Save pos station into invoice
2018-10-08 22:28:30 +02:00
Alexandre SPANGARO
75b9862c14
New : Add FEC Export in accountancy
2018-10-08 21:01:21 +02:00
Laurent Destailleur
923b561aff
FIX Option for prof id mandatory not working with custom type of company
2018-10-08 20:01:45 +02:00
Laurent Destailleur
91038af84d
FIX properties on proposal must not be modified if error
2018-10-08 18:15:46 +02:00
Laurent Destailleur
c930218dd2
FIX Missing transaction around action
2018-10-08 17:40:17 +02:00
Nicolas Aupetit
c26fe00362
fix bank ref override "bordereau cheque" ref
2018-10-09 02:15:38 +11:00
atm-quentin
c6ab79bad3
NEW note, contact and lines on card
2018-10-08 16:54:33 +02:00
gauthier
021f9552dd
FIX : when we're just admin and not super admin, if we create new user with transverse mode, we don't see it then we can't add him in usergroup
2018-10-08 15:41:31 +02:00
Laurent Destailleur
44d0ed7a0c
Introduce SOCIETE_SHOW_FIELD_IN_TOOLTIP for fields to show in tooltip
2018-10-08 15:13:01 +02:00
Laurent Destailleur
0c7b7ed7f4
FIX Required extrafield value numeric should accept '0'
2018-10-08 14:26:18 +02:00
Laurent Destailleur
7be9b6d94e
Fix translation of source of proposals
2018-10-08 14:04:22 +02:00
Abbes Bahfir
f0d8a5da9a
Fix: Reminder : TODO Add Javascript code to add input fields contents to new elements urls
2018-10-08 12:39:59 +01:00
atm-quentin
095d851e79
FIX affichage ligne reception
2018-10-08 12:15:17 +02:00
Abbes Bahfir
7d25311ce5
New : Link to create new element on linked fields
2018-10-08 10:59:01 +01:00
Laurent Destailleur
08ca85e995
Fix type
2018-10-08 02:19:32 +02:00
Laurent Destailleur
d776fc423e
Fix search criterai of contract
2018-10-08 00:52:21 +02:00
Laurent Destailleur
9f5e44c568
Fix search criterai of contract
2018-10-08 00:51:08 +02:00
Laurent Destailleur
df7f218d01
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-07 21:47:32 +02:00
Laurent Destailleur
d4b6429ccd
Fix regression into backup feature
2018-10-07 21:45:20 +02:00
Laurent Destailleur
b61f3b4313
Look and feel v8
2018-10-07 17:31:35 +02:00
Laurent Destailleur
19cf649b48
Add field to track source module of invoice
2018-10-07 13:59:40 +02:00
Laurent Destailleur
f9f93f58df
Add field to track source module of invoice
2018-10-07 13:49:09 +02:00
Laurent Destailleur
402a383c83
Uniformize field os social networks
2018-10-07 13:31:40 +02:00
Maxime Kohlhaas
320ca3db67
Fix request on project overview
...
Fixes #9220
2018-10-06 22:53:28 +02:00
Laurent Destailleur
59a082d251
FIX Show the date of invoice on supplier payment
2018-10-06 21:33:43 +02:00
Laurent Destailleur
476aab9bae
Same order than top menu
2018-10-06 21:00:26 +02:00
Laurent Destailleur
4967aec0a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-06 20:54:26 +02:00
Laurent Destailleur
506ba30d5a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-06 20:54:14 +02:00
Laurent Destailleur
a7d26409c7
FIX trackid into email sent from member module.
2018-10-06 20:51:35 +02:00
Laurent Destailleur
fef40439be
responsive
2018-10-06 20:05:41 +02:00
Laurent Destailleur
3e49935eac
Fix online payment
2018-10-06 15:48:47 +02:00
ias-ceo
de17977bff
new malay lang tag
2018-10-06 15:09:06 +03:00
Laurent Destailleur
6390f558e8
Merge pull request #9694 from frederic34/datapol
...
reduce lines length
2018-10-06 12:55:33 +02:00
Laurent Destailleur
4c67fae781
Merge pull request #9691 from ebzao/ebzao-a53bed300f28813539023e8fc69c1052bbe93575
...
fix API check sql filters
2018-10-06 12:51:30 +02:00
Laurent Destailleur
a0ba01321b
Fix phpcs
2018-10-06 12:50:32 +02:00
Laurent Destailleur
dc0489cdcf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-06 12:48:40 +02:00
Laurent Destailleur
df1c6e5aee
Fix phpcs
2018-10-06 12:48:28 +02:00
Laurent Destailleur
086748396c
Merge pull request #9692 from ebzao/ebzao-546ec625b96d7ff1725fff1cf153f1865b2972f4
...
Typo fix: "eee" in localtax1 display
2018-10-06 12:47:14 +02:00
Laurent Destailleur
ccc6dea85c
Merge pull request #9686 from frederic34/patch-11
...
PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
2018-10-06 12:46:54 +02:00
Laurent Destailleur
36b75031f5
Merge pull request #9681 from ptibogxiv/patch-70
...
Fix metadata for charge.php
2018-10-06 12:44:16 +02:00
Laurent Destailleur
5045bbc3bd
Update newpayment.php
2018-10-06 12:44:06 +02:00
Laurent Destailleur
835ca4e4a5
Update newpayment.php
2018-10-06 12:42:14 +02:00
Laurent Destailleur
f742b0f55b
Merge pull request #9685 from frederic34/patch-9
...
PSR2.Classes.ClassDeclaration.CloseBraceAfterBody
2018-10-06 12:39:30 +02:00
Philippe GRAND
61daff6cb6
Standardize code
2018-10-06 12:34:51 +02:00
Philippe GRAND
956c7b21e2
Standardize code
2018-10-06 12:18:03 +02:00
Philippe GRAND
596dba9ce1
Standardize code
2018-10-06 12:14:47 +02:00
Philippe GRAND
83db36f9b2
Standardize code
2018-10-06 12:11:48 +02:00
Philippe GRAND
dd9af92020
Standardize code
2018-10-06 12:07:24 +02:00
Philippe GRAND
5890647afd
Standardize code
2018-10-06 12:04:17 +02:00
Philippe GRAND
74c86f477c
Standardize code
2018-10-06 12:01:00 +02:00
Philippe GRAND
5583211246
Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018
2018-10-06 12:00:24 +02:00
Laurent Destailleur
e24117e75b
Fix position of modules is string on 2 digits
2018-10-06 11:57:53 +02:00
Philippe GRAND
fc4fea6f02
Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018
2018-10-06 11:50:25 +02:00
Frédéric FRANCE
3dd3693e7c
reduce linelength
2018-10-06 11:06:20 +02:00
Frédéric FRANCE
990b34bcb2
reduce lines length
2018-10-06 10:51:36 +02:00
Frédéric FRANCE
6d645a39e2
reduce lines length
2018-10-06 10:37:05 +02:00
Nicolas Aupetit
49693854ce
Typo fix: "eee" in localtax1 display
2018-10-06 13:51:46 +11:00
Nicolas Aupetit
a02fdd1f4d
fix API check sql filters
...
Correct PHP7 warning about wrong usage of count() function
2018-10-06 13:44:10 +11:00
Laurent Destailleur
c0d45430c4
Fix phpcs
2018-10-06 03:15:27 +02:00
Laurent Destailleur
d1dde0ffac
Include rgpd module with name DataPolicies
2018-10-06 02:51:47 +02:00
atm-quentin
815353ec36
debut dbg line
2018-10-05 16:40:43 +02:00
atm-quentin
6a8092dfae
NEW entete reception card
2018-10-05 16:21:50 +02:00
Philippe GRAND
b3925dd2bd
Standardize code
2018-10-05 16:04:10 +02:00
Philippe GRAND
bcfdeeea88
Standardize code
2018-10-05 15:55:47 +02:00
Philippe GRAND
073ec85208
Standardize code
2018-10-05 15:51:08 +02:00
Philippe GRAND
da560289e3
Standardize code
2018-10-05 15:48:38 +02:00
Philippe GRAND
94df8d297d
Standardize code
2018-10-05 15:44:57 +02:00
Philippe GRAND
c7c3780400
clean code
2018-10-05 15:34:32 +02:00
Laurent Destailleur
5437c2ae85
Fix popup on img_picto
2018-10-05 14:32:19 +02:00
Laurent Destailleur
4e84ed0e80
FIX Symbol of currency in substitution variables
2018-10-05 13:59:46 +02:00
Laurent Destailleur
d1ad5dd4f1
FIX Symbol of currency in substitution variables
2018-10-05 13:58:38 +02:00
Laurent Destailleur
429b078708
Typo
2018-10-05 13:42:30 +02:00
Marc de Lima Lucio
82651cd920
FIX: invoice stats: situation invoices were not counted
2018-10-05 12:12:04 +02:00
florian HENRY
cba4676032
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix9161
2018-10-05 10:36:03 +02:00
florian HENRY
68c99d01a7
OMG!!!! var_dump....
2018-10-05 10:35:32 +02:00
ptibogxiv
0e83863d45
Add save or not source functionnality
2018-10-04 20:32:49 +02:00
Frédéric FRANCE
2fc54ccf66
PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
2018-10-04 20:23:58 +02:00
Laurent Destailleur
10033e8f64
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-04 20:22:56 +02:00
Laurent Destailleur
f154139a0e
Reduce length of tab title "Bank"
2018-10-04 20:22:25 +02:00
Frédéric FRANCE
48a063eca4
PSR2.Classes.ClassDeclaration.CloseBraceAfterBody
2018-10-04 20:18:24 +02:00
Laurent Destailleur
29cafc78d0
Merge pull request #9634 from grandoc/new_branch_29_09_2018
...
add some significant info within notification mail
2018-10-04 19:31:31 +02:00
Laurent Destailleur
4fad28d360
Update notify.class.php
2018-10-04 19:30:45 +02:00
Laurent Destailleur
2232bd3944
Update notify.class.php
2018-10-04 19:30:03 +02:00
ptibogxiv
f5966e6303
Update newpayment.php
2018-10-04 19:29:52 +02:00
Laurent Destailleur
41add1c251
Standardize code
2018-10-04 19:19:29 +02:00
Laurent Destailleur
6fcb45cf40
Rename page various_payment/index.php into list.php (coding rule)
2018-10-04 19:10:39 +02:00
Laurent Destailleur
3e36612a52
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-04 19:07:51 +02:00
Laurent Destailleur
5b350a0322
Use short label
2018-10-04 19:07:38 +02:00
Laurent Destailleur
b20dc5678c
Merge pull request #9684 from atm-ph/fix_7.0_wrong_modulepart_name
...
FIX wrong value for module part and return access denied
2018-10-04 19:06:53 +02:00
Laurent Destailleur
8592b03b49
Merge pull request #9682 from atm-ph/fix_7.0_missing_hook
...
Fix missing hook on sellsjournal
2018-10-04 19:06:02 +02:00
Laurent Destailleur
571bc86836
Update newpayment.php
2018-10-04 19:03:18 +02:00
Laurent Destailleur
17e4af50ec
Merge pull request #9680 from ATM-Nicolas/fix_wrong_variable_name
...
FIX : Wrong variable name
2018-10-04 18:47:08 +02:00
Laurent Destailleur
20f45db6b8
Merge pull request #9677 from grandoc/new_branch_04_10_2018
...
Standardize and update code
2018-10-04 18:33:24 +02:00
Laurent Destailleur
ac86eac508
Merge pull request #9675 from atm-ph/fix_7.0_dom_error
...
Fix minor error in dom
2018-10-04 18:32:52 +02:00
Laurent Destailleur
5034264d60
Debug / Standardize code
2018-10-04 18:27:49 +02:00
Laurent Destailleur
ebba33635b
Close #9674 by keeping old code present (this help for transition tests)
2018-10-04 18:20:57 +02:00
Laurent Destailleur
09fbe479d1
Missing picto
2018-10-04 18:01:20 +02:00
Laurent Destailleur
b52a38bcd2
Trans
2018-10-04 17:59:34 +02:00
Laurent Destailleur
31916c94f0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-04 17:57:20 +02:00
Laurent Destailleur
b3b2305651
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/pdf.lib.php
2018-10-04 17:56:56 +02:00
Laurent Destailleur
9fe5f242a7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-04 17:53:59 +02:00
Laurent Destailleur
13759ea146
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2018-10-04 17:53:40 +02:00
Laurent Destailleur
3060647212
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2018-10-04 17:50:19 +02:00
Laurent Destailleur
8690d65479
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2018-10-04 17:47:22 +02:00
Laurent Destailleur
1c735ea6d5
Merge pull request #9673 from atm-florian/dev_resource
...
NEW : add event tab on resource card
2018-10-04 17:45:01 +02:00
Laurent Destailleur
2aca9cb394
Update company.lib.php
2018-10-04 17:44:47 +02:00
Laurent Destailleur
75b9140446
Merge pull request #9672 from atm-florian/8.0
...
FIX ressource list with extrafields
2018-10-04 17:40:42 +02:00
Laurent Destailleur
577192554d
Merge pull request #9670 from oas-services/7.0
...
Fix issue #9434 : no array_options available when calling api on order line and invoice line
2018-10-04 17:39:37 +02:00
atm-quentin
752c35d6d1
addline presque fini
2018-10-04 17:32:50 +02:00
Laurent Destailleur
3b7af822db
Merge pull request #9663 from frederic34/patch-18
...
add missing translation key found in box graph
2018-10-04 17:26:42 +02:00
Laurent Destailleur
ba3552558c
Merge pull request #9662 from frederic34/patch-17
...
remove useless param
2018-10-04 17:26:21 +02:00
Laurent Destailleur
9f2a2be837
Merge pull request #9661 from frederic34/patch-16
...
remove useless phpcs:disable
2018-10-04 17:25:44 +02:00
Laurent Destailleur
0fd7a5a172
Merge pull request #9659 from frederic34/patch-15
...
typo in template
2018-10-04 17:22:47 +02:00
Laurent Destailleur
301f7349e0
Merge pull request #9656 from fmarcet/8.0
...
FIX Can't create shipping if have shipping line's extrafields
2018-10-04 17:22:24 +02:00
Laurent Destailleur
34f1691302
Merge pull request #9655 from frederic34/patch-11
...
group same condition into one in html.formprojet.class.php
2018-10-04 17:15:15 +02:00
Laurent Destailleur
16aef0e9fc
Merge pull request #9651 from frederic34/patch-9
...
fix td filecheck
2018-10-04 17:09:46 +02:00
Laurent Destailleur
9e95ae0e3a
Merge pull request #9650 from bafbes/abb80017
...
Fix : backtopage link in listings
2018-10-04 17:09:25 +02:00
Laurent Destailleur
dec313810d
Update myobject_list.php
2018-10-04 17:09:19 +02:00
Laurent Destailleur
3a0d777df7
Merge pull request #9649 from lex111/replaces-load
...
Replace multiple load calls with loadLangs method
2018-10-04 17:05:48 +02:00
Laurent Destailleur
f6099fba15
Fix phpcs
2018-10-04 16:58:34 +02:00
atm-ph
bfaf25ca2a
Fix wrong value for module part and return access denied
2018-10-04 16:55:16 +02:00
Laurent Destailleur
1f44380dd1
Clean code
2018-10-04 16:20:55 +02:00
Laurent Destailleur
111d589474
NEW Can mix offset before and after with rules for due date of invoices
2018-10-04 16:06:26 +02:00
Laurent Destailleur
75c968b4ae
FIX Backup of database without mysqladmin available from cron.
2018-10-04 13:10:48 +02:00
atm-quentin
5fe767d7bd
debut card create
2018-10-04 12:27:10 +02:00
Laurent Destailleur
7a94f4fc00
Add more logs
2018-10-04 11:34:46 +02:00
ptibogxiv
762abf7060
Update newpayment.php
2018-10-04 10:59:06 +02:00
atm-ph
58d1ac427e
Fix missing hook on sellsjournal
2018-10-04 10:57:22 +02:00
ptibogxiv
d36dda37e6
Fix metadata for charge.php
...
Fix for dol_id, dol_type
2018-10-04 10:56:29 +02:00
atm-quentin
bc07936d42
NEW list on dispatch
2018-10-04 10:17:18 +02:00
Philippe GRAND
e045d0e9ac
Translation
2018-10-04 09:55:05 +02:00
ATM-Nicolas
c048f51562
FIX : Wrong variable name
2018-10-04 09:54:40 +02:00
atm-quentin
00f532c436
validation modèle de données
2018-10-04 09:50:39 +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
Philippe GRAND
8bee69277d
Standardize and update code
2018-10-04 09:33:30 +02:00
Philippe GRAND
d2ec703b51
Standardize and update code
2018-10-04 09:24:57 +02:00
Philippe GRAND
c32b96c207
Standardize and update code
2018-10-04 09:15:15 +02:00
atm-ph
2acd69033c
Fix minor error in dom
2018-10-03 22:48:29 +02:00
florian HENRY
d09bbe4690
NEW : add event tab on resource card
2018-10-03 21:13:02 +02:00
Laurent Destailleur
378013b863
Better select language component
2018-10-03 20:58:45 +02:00
Laurent Destailleur
83be1759b1
Work on multilang website
2018-10-03 20:00:52 +02:00
Laurent Destailleur
402175bb49
Work on multilang
2018-10-03 19:53:33 +02:00
Laurent Destailleur
fd859d3162
Add a component to select lang into a web site
2018-10-03 18:40:54 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
Laurent Destailleur
2cd843acec
Fix separator too long
2018-10-03 16:02:42 +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
Laurent Destailleur
8ee98315c7
Lang
2018-10-03 13:13:16 +02:00
atm-quentin
41d8cb87a3
debut reception setup page
2018-10-03 12:22:41 +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
Laurent Destailleur
76f5d53840
Fix deletion of credit card when no Oauth set
2018-10-02 22:34:41 +02:00
Frédéric FRANCE
a722e98d8d
add missing translation key found in box graph
2018-10-02 21:20:04 +02:00
Frédéric FRANCE
1735229f15
remove useless param
...
/**
* Return label of a status
*
* @param int $statut Id statut
* @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
* @param int $billed 1=Billed
* @return string Label of status
*/
function LibStatut($statut,$mode=0,$billed=0)
{
2018-10-02 20:47:40 +02:00
Frédéric FRANCE
dae2757b73
remove useless phpcs:disable
2018-10-02 20:39:44 +02:00
atm-quentin
69c46ecd86
set order status to valid when shipping set to draft
2018-10-02 16:54:20 +02:00
Laurent Destailleur
56cb0763d1
Add maincolor property on website
2018-10-02 16:46:54 +02:00
Frédéric FRANCE
a7b2b00230
typo in template
2018-10-02 15:56:12 +02:00
John BOTELLA
af66a8971a
NEW Hidden conf INVOICE_USE_DEFAULT_DOCUMENT
2018-10-02 15:51:17 +02:00
atm-quentin
baed678b6e
NEW shipping set draft and update line
2018-10-02 15:49:31 +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
53b0ac8217
Rename template
2018-10-01 21:25:51 +02:00
Frédéric FRANCE
e8cf59e6f6
Update html.formprojet.class.php
2018-10-01 21:03:33 +02:00
Laurent Destailleur
af497271a4
Rename template website
2018-10-01 21:00:54 +02:00
Laurent Destailleur
a8f16f6570
Update template web site
2018-10-01 20:59:17 +02:00
Laurent Destailleur
771922f427
Use 2 distinct left menu entries for leads and projects
2018-10-01 18:56:47 +02:00
Philippe GRAND
c22b80831d
fix regression
2018-10-01 17:14:28 +02:00
Philippe GRAND
0aae40f8aa
fix when there is no project
2018-10-01 17:05:52 +02:00
Laurent Destailleur
6ed67ea77f
Clean code
2018-10-01 13:54:45 +02:00
Frédéric FRANCE
96139d88a4
fix td filecheck
2018-10-01 13:45:17 +02:00
Laurent Destailleur
957d5958a4
Work on website
2018-10-01 13:09:12 +02:00
Abbes Bahfir
0cb5b52318
Fix : backtopage link in listings
2018-10-01 11:10:46 +01:00
Philippe GRAND
b32a9cc50e
fix if no project linked
2018-10-01 09:13:02 +02:00
Alexey Pyltsyn
49de7a5881
Replace multiple load calls with loadLangs method
2018-10-01 09:22:23 +03:00
Laurent Destailleur
15780f71b4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-01 03:22:20 +02:00
Laurent Destailleur
873f43db94
Uniformize interface for tickets
2018-10-01 03:19:21 +02:00
Laurent Destailleur
1dfbb22bf8
Merge branch 'develop' into new_branch_13_09_2018
2018-10-01 02:20:16 +02:00
Laurent Destailleur
fdd6c8d6bf
Merge pull request #9648 from frederic34/patch-18
...
simplify mod_codeclient_monkey.php
2018-10-01 01:21:08 +02:00
Laurent Destailleur
77dad1b32b
Merge pull request #9647 from frederic34/patch-17
...
indentation fix in commonobject class
2018-10-01 01:20:17 +02:00
Laurent Destailleur
95e16d17ac
Merge pull request #9646 from frederic34/patch-16
...
add index.html in user directory #9571
2018-10-01 01:19:40 +02:00
Laurent Destailleur
93fb945ba2
Merge pull request #9645 from frederic34/patch-15
...
remove link to custom in actions_takepos.class.php
2018-10-01 01:19:20 +02:00
Laurent Destailleur
8ccbdfa39d
Merge pull request #9638 from frederic34/patch-11
...
remove $var from takepos admin setup
2018-10-01 01:16:33 +02:00
Laurent Destailleur
84c062a03d
Merge pull request #9637 from frederic34/patch-10
...
add code_compta_client to Societe class
2018-10-01 01:16:18 +02:00
Laurent Destailleur
5050068e59
Merge pull request #9636 from frederic34/patch-9
...
update sql table for takepos module
2018-10-01 01:16:01 +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
d2e4752427
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-01 01:14:03 +02:00
Laurent Destailleur
7ff230a54b
Merge pull request #9635 from aspangaro/develop
...
FIX Title problem on admin RSS module
2018-10-01 01:13:51 +02:00
Laurent Destailleur
d51eb1977a
FIX Pagination stats
2018-10-01 01:10:42 +02:00
Laurent Destailleur
ae62204a79
Merge pull request #9628 from grandoc/new_branch_28_09_2018
...
Standardize and update code
2018-10-01 01:04:36 +02:00
Laurent Destailleur
fc4103b469
Clean code
2018-10-01 00:44:07 +02:00
Laurent Destailleur
5f897eb7ee
Clean code
2018-10-01 00:40:02 +02:00
Laurent Destailleur
adc36e7d63
Clean code
2018-10-01 00:20:47 +02:00
Frédéric FRANCE
c8ddf18558
Update mod_codeclient_monkey.php
2018-09-30 23:02:52 +02:00
Frédéric FRANCE
2af15ee932
Update commonobject.class.php
2018-09-30 17:59:04 +02:00
Frédéric FRANCE
4d72812129
Create index.html
2018-09-30 14:56:12 +02:00
Frédéric FRANCE
3f0162789b
Create index.html
2018-09-30 14:55:55 +02:00
Frédéric FRANCE
877184638c
add index.html in user directory
2018-09-30 14:55:15 +02:00
Frédéric FRANCE
0ac56fde1b
Update actions_takepos.class.php
2018-09-30 14:26:35 +02:00
Frédéric FRANCE
84ff287c36
remove $var from takepos admin setup
2018-09-30 10:56:55 +02:00
Frédéric FRANCE
a88262e9a6
add code_compta_client to Societe class
2018-09-30 10:52:40 +02:00
Frédéric FRANCE
2b8ec8db1f
Update llx_takepos_floor_tables.sql
2018-09-30 10:33:52 +02:00
Frédéric FRANCE
6f48f37fa0
Update 8.0.0-9.0.0.sql
2018-09-30 10:31:08 +02:00
Philippe Grand
8acddb5bab
Update notify.class.php
2018-09-29 18:43:50 +02:00
Philippe Grand
9a2fd7defe
Update notify.class.php
2018-09-29 18:41:31 +02:00
Alexandre SPANGARO
825f774b53
FIX Title problem on admin RSS module
2018-09-29 15:28:03 +02:00
Philippe GRAND
8ef9a301b3
add some significant info within notification mail
2018-09-29 14:51:52 +02:00
Laurent Destailleur
f32ccf935a
CSS
2018-09-28 23:06:57 +02:00
Laurent Destailleur
2f88f84e3b
Clean code
2018-09-28 22:13:42 +02:00
Laurent Destailleur
aaa5efc77e
Clean Take pos module
2018-09-28 22:06:04 +02:00
Laurent Destailleur
a4ec613d73
Move sql table
2018-09-28 19:40:44 +02:00
Laurent Destailleur
492b9c1a03
Fix phpcs
2018-09-28 18:03:53 +02:00
Laurent Destailleur
f667270d4d
Add option to not load all object and fix so linkedObjectsIds has same
...
content than linkedObjects
2018-09-28 17:38:29 +02:00
Laurent Destailleur
a3065ae612
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-28 16:15:27 +02:00
Laurent Destailleur
e2f450aa8c
Fix regession losing description.
...
Rename updateligne into updateline.
2018-09-28 16:15:17 +02:00
Laurent Destailleur
3de5f8278a
Merge pull request #9623 from medialta/8.0
...
Fix state name for list field title in adherent
2018-09-28 16:04:54 +02:00
Philippe GRAND
b183054073
Standardize and update code
2018-09-28 15:57:13 +02:00
Philippe GRAND
61ad84d6e1
Fix Travis Error:The closing brace for the class must go on the next line after the body
2018-09-28 15:19:45 +02:00
Philippe GRAND
574cfad48f
Standardize and update code
2018-09-28 14:49:34 +02:00
Philippe GRAND
15ff9f8917
Standardize and update code
2018-09-28 14:44:47 +02:00
Philippe GRAND
f630e2100a
Standardize and update code
2018-09-28 14:32:57 +02:00
Laurent Destailleur
47da95fbbf
Fix dependency of module
2018-09-28 13:50:37 +02:00
Laurent Destailleur
78fbb6cd89
Rename label
2018-09-28 13:48:11 +02:00
Laurent Destailleur
603db250f0
Clean takepos
2018-09-28 13:36:46 +02:00
Laurent Destailleur
f990719daa
Add experimental module TakePOS
2018-09-28 13:31:41 +02:00
Laurent Destailleur
ec2dd7ba4e
Remove not used code
2018-09-28 13:13:04 +02:00
Laurent Destailleur
e9dd967610
Support nomassaction param on list
2018-09-28 13:12:47 +02:00
Laurent Destailleur
224896a4dc
Code comments
2018-09-28 10:52:15 +02:00
Laurent Destailleur
c5a68d2462
Clean code
2018-09-28 10:51:55 +02:00
Laurent Destailleur
b2576305c1
Clean code
2018-09-28 10:46:59 +02:00
Laurent Destailleur
118ff2d8d0
phpcs
2018-09-28 10:42:42 +02:00
Laurent Destailleur
a88dcfd1e4
Fix phpcs
2018-09-28 02:24:11 +02:00
Laurent Destailleur
3f3c8aeb26
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-28 02:23:20 +02:00
Laurent Destailleur
c07ab81e6a
Fix trans
2018-09-28 02:22:23 +02:00
Laurent Destailleur
33130853c8
Fix website
2018-09-28 00:59:02 +02:00
Laurent Destailleur
851fd4cc18
NEW Can set the default focus of each page.
...
NEW Can set if a field is mandatory on form level.
2018-09-28 00:52:15 +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
a623d80830
Work on mandatory form fields
2018-09-27 16:38:18 +02:00
Emma
0979633850
Fix state name for list field title in adherent
2018-09-27 14:22:33 +02:00
Laurent Destailleur
e252a5f046
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-27 12:55:45 +02:00
Laurent Destailleur
62b31df069
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/rssparser.class.php
htdocs/langs/en_US/boxes.lang
2018-09-27 12:55:25 +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
ptibogxiv
a05bdccb06
Prepare for more stripe function
2018-09-27 10:47:58 +02:00
ptibogxiv
78b8881c44
Prepare for more stripe function
...
support refund, dispute, capture....
2018-09-27 10:43:43 +02:00
Laurent Destailleur
60c74a6255
Merge pull request #9582 from grandoc/new_branch_21_09_2018
...
Standardize and update code from New branch 21 09 2018
2018-09-27 10:07:15 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price
...
NEW Advanced permission to ignore price min
2018-09-27 09:57:49 +02:00
ptibogxiv
9598901933
Update config.php
2018-09-27 09:43:43 +02:00
Philippe Grand
031b3b44c5
Merge branch 'develop' into new_branch_13_09_2018
2018-09-27 09:42:58 +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
e35aed0c28
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-27 09:36:31 +02:00
Laurent Destailleur
0004cbde96
Merge pull request #9617 from cebe/fix-german-account-rowids
...
Update german accounting file to use rowid
2018-09-27 09:36:09 +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
8e5ff64d22
Merge pull request #9615 from aljawaid/patch-1
...
NEW Add more common social networks fields for business
2018-09-27 09:33:37 +02:00
Laurent Destailleur
9630c7b5c7
Merge pull request #9614 from grandoc/new_branch_25_09_2018
...
Add some code comment
2018-09-27 09:31:19 +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
Philippe Grand
b7304e3d82
Merge branch 'develop' into new_branch_21_09_2018
2018-09-27 09:29:26 +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
b8ae88cf26
Merge pull request #9602 from grandoc/new_branch_24_09_2018
...
Standardize and update code
2018-09-27 09:19:59 +02:00
Laurent Destailleur
7e58662c6f
Merge branch 'develop' into patch-9
2018-09-27 09:18:42 +02:00
Laurent Destailleur
6f92c230aa
Merge pull request #9600 from grandoc/new_branch_23_09_2018
...
Translated comment
2018-09-27 09:17:53 +02:00
Laurent Destailleur
29893daf6f
Merge pull request #9599 from zeenlym/forgotten_passlink
...
NEW Change forgotten password link in general parameters
2018-09-27 09:17:28 +02:00
Laurent Destailleur
6680fca6c6
Add missing translation key
2018-09-27 09:13:28 +02:00
Laurent Destailleur
2b8ccc0c81
FIX Link template invoice to contract
2018-09-27 01:53:12 +02:00
Laurent Destailleur
9123329800
FIX Link template invoice to contract
2018-09-26 23:44:27 +02:00
Marc de Lima Lucio
af93fc7484
FIX: showOptionals: column mismatches
2018-09-26 17:19:06 +02:00
Laurent Destailleur
98b1e13ed7
Work on module socialnetworks
2018-09-26 16:55:46 +02:00
Laurent Destailleur
79ade6a1af
Work on website
2018-09-26 15:20:37 +02:00
Carsten Brandt
73ed340766
Update german accounting file to use rowid
...
- fix "TODO Fix this file to use rowid"
2018-09-26 11:52:06 +02:00
Laurent Destailleur
0987db765c
Work on export/import
2018-09-26 11:28:41 +02:00
Laurent Destailleur
0a4d80012a
Support export/import of logo site in web site templates
2018-09-26 11:15:11 +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
IJ
68dc213601
Correct Google+ to plus
2018-09-26 07:36:22 +01:00
IJ
9fd7d98c26
Add social fields
2018-09-26 07:35:26 +01:00
IJ
d063f6fdeb
Add social fields
2018-09-26 07:34:09 +01:00
IJ
c90cd4ae29
Add more social fields
2018-09-26 07:21:21 +01:00
Laurent Destailleur
f2d53e80e5
Optimize performance of cron that rotate logs
2018-09-26 01:45:24 +02:00
Laurent Destailleur
c2335c0a5e
Update websote template
2018-09-26 00:17:53 +02:00
Laurent Destailleur
2ef0cb8d9b
Fix cloning
2018-09-25 20:34:05 +02:00
Philippe GRAND
746d73b8e6
Add some code comment
2018-09-25 17:26:57 +02:00
Laurent Destailleur
eff1d1c89e
Work on website module
2018-09-25 16:35:59 +02:00
Frédéric FRANCE
a9f7bdead6
fix Option MAIN_DISABLE_NOTES_TAB #9611
2018-09-25 15:22:08 +02:00
Laurent Destailleur
e6be047178
Work on new management for website module
2018-09-25 15:00:37 +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
Laurent Destailleur
b4b6e900f9
css
2018-09-25 11:42:19 +02:00
Laurent Destailleur
ba3ca550ce
Fix date in text for substitution. Removed not used translation keys.
2018-09-25 11:36:40 +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
bd523973d8
Add missing translation key
2018-09-25 00:55:03 +02:00
Laurent Destailleur
b93ab79679
FIX Error messages
2018-09-25 00:39:28 +02:00
Laurent Destailleur
df64961c6b
FIX nb of session in title
2018-09-24 21:56:57 +02:00
Laurent Destailleur
f04b8eea6d
Work on website module
2018-09-24 19:21:21 +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
9dc4ad4cc3
Add warning when using editinline
2018-09-24 15:38:13 +02:00
Laurent Destailleur
ea517da85c
Work on filemanager for websites
2018-09-24 15:14:32 +02:00
Laurent Destailleur
eeda176ed6
FIX Bad position of hook formattachOptions call
2018-09-24 15:13:18 +02:00
Philippe GRAND
3f2f903e6f
Specifics comments
2018-09-24 12:22:41 +02:00
Philippe GRAND
d7df74656e
Standardize and update code
2018-09-24 12:03:49 +02:00
Philippe GRAND
ac31b79d9d
Standardize and update code
2018-09-24 11:58:01 +02:00
Philippe GRAND
1f2493f361
Standardize and update code
2018-09-24 11:45:34 +02:00
Frédéric FRANCE
86072ad1d7
remove superfluous space
2018-09-24 10:43:57 +02:00
Laurent Destailleur
5c0e6eacf6
Use latest instead of last
2018-09-24 10:43:12 +02:00
Laurent Destailleur
26d585ffbe
Use latest instead of last
2018-09-24 10:43:01 +02:00
Laurent Destailleur
436deea4c5
Code comment
2018-09-24 10:26:49 +02:00
Laurent Destailleur
ad6895aa2e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-24 10:23:09 +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
a4cd96e03c
Clean code when there is no setup to do
2018-09-24 10:08:57 +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
Philippe GRAND
2799bd175d
Translated comment
2018-09-23 21:35:43 +02:00
Yanis LISIMA
753089a99d
NEW Change forgotten password link in general parameters
...
In some cases, user password are managed by external systems (ex: LDAP).
The new parameter MAIN_PASSWORD_FORGOTLINK will send users to true forgotten password link.
2018-09-23 21:26:07 +02:00
Laurent Destailleur
d9ccc7624b
Standardize code
2018-09-23 16:09:25 +02:00
Laurent Destailleur
33f9600c9c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-23 15:58:43 +02:00
Laurent Destailleur
6c814b32bd
Standardize cod
2018-09-23 15:58:33 +02:00
Laurent Destailleur
f88170e22a
Merge pull request #9596 from tuxgasy/dev_bank_treso_hooks
...
NEW Add somes hooks in bank planned entries
2018-09-23 15:49:50 +02:00
Laurent Destailleur
94c43716b3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-23 15:47:35 +02:00
Laurent Destailleur
48ca7e4603
Typo
2018-09-23 15:47:13 +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
Laurent Destailleur
e277670a70
Merge pull request #9573 from grandoc/new_branch_20_09_2018
...
Standardize and update code from New branch 20 09 2018
2018-09-23 15:35:42 +02:00
Laurent Destailleur
29979a8429
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-23 14:57:55 +02:00
Laurent Destailleur
8aa22f2c33
NEW Add option to swap sender/recipient address on PDF
2018-09-23 14:57:44 +02:00
Laurent Destailleur
a5b8c9f9e2
Merge pull request #9581 from grandoc/develop
...
Standardize and update code
2018-09-23 14:46:31 +02:00
Philippe GRAND
0a86515efc
Merge remote-tracking branch 'upstream/develop' into develop
2018-09-23 11:48:06 +02:00
TuxGasy
db223af39b
Add somes hooks in bank planned entries
2018-09-22 18:44:00 +02:00
ptibogxiv
77dd516023
fix number mailing for a contact / multicompany
2018-09-22 14:45:15 +02:00
Frédéric FRANCE
da7dc72ddb
Merge branch 'develop' into patch-9
2018-09-22 10:20:02 +02:00
Philippe GRAND
3464afe391
Update comment
2018-09-21 15:12:17 +02:00
Philippe GRAND
3355004e5d
Merge branch 'new_branch_21_09_2018' of github.com:grandoc/dolibarr into new_branch_21_09_2018
2018-09-21 15:07:44 +02:00
Philippe GRAND
1690ed86a7
Merge remote-tracking branch 'upstream/develop' into new_branch_21_09_2018
2018-09-21 15:06:53 +02:00
Laurent Destailleur
fab57e163e
Fix phpcs
2018-09-21 14:52:06 +02:00
gauthier
7b46bedce6
NEW : hidden configuration
2018-09-21 14:35:36 +02:00
Philippe Grand
870f504633
Update doc_generic_usergroup_odt.modules.php
2018-09-21 14:34:30 +02:00
Philippe Grand
0bcec6c923
Update doc_generic_user_odt.modules.php
2018-09-21 14:33:48 +02:00
Philippe Grand
2afaccf099
Update mod_ticket_universal.php
2018-09-21 14:32:31 +02:00
Philippe GRAND
9fab0a1d45
Update comments
2018-09-21 14:16:22 +02:00
Philippe GRAND
de6fca0844
fix merging
2018-09-21 14:09:12 +02:00
Philippe GRAND
48c3a1e1bc
fix merging
2018-09-21 14:06:55 +02:00
Philippe Grand
d5003c9d3c
Merge branch 'develop' into new_branch_21_09_2018
2018-09-21 13:55:04 +02:00
Frédéric FRANCE
b064b580b4
remove superfluous spaces
2018-09-21 12:19:59 +02:00
Laurent Destailleur
7ece28ffd3
Trans
2018-09-21 11:48:01 +02:00
Laurent Destailleur
3be13f0cb6
Fix css
2018-09-21 11:45:04 +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
Laurent Destailleur
0abe05c6b7
Fix no form inside a table
2018-09-21 11:29:01 +02:00
Laurent Destailleur
e2a9bf3a83
Merge pull request #9586 from frederic34/patch-9
...
correct link to setup modulebuilder
2018-09-21 11:18:21 +02:00
Laurent Destailleur
ac8f82338e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-21 11:12:27 +02:00
Frédéric FRANCE
7434b076d8
correct link to setup modulebuilder
2018-09-21 11:12:19 +02:00
Laurent Destailleur
a078951a94
Add an help for user to avoid bad configuration
2018-09-21 11:12:08 +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
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018
2018-09-21 10:12:48 +02:00
Laurent Destailleur
90b327af1d
Merge pull request #9584 from ptibogxiv/patch-54
...
fix link with connect transaction.php
2018-09-21 09:59:57 +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
ptibogxiv
60cb83cf25
Update transaction.php
2018-09-21 09:55:24 +02:00
ptibogxiv
d09b74abe5
Update transaction.php
2018-09-21 09:54:07 +02:00
ptibogxiv
933f253c86
Update transaction.php
2018-09-21 09:52:27 +02:00
ptibogxiv
61d0aa66a5
Update transaction.php
2018-09-21 09:52:08 +02:00
ptibogxiv
d544f0598b
fix link in connect mode
2018-09-21 09:50:31 +02:00
Laurent Destailleur
8cfe5d7252
Merge pull request #9569 from grandoc/new_branch_19_09_2018
...
Missing translation
2018-09-21 09:50:18 +02:00
ptibogxiv
d0fafe8f0f
fix link with connect transaction.php
2018-09-21 09:49:13 +02:00
Laurent Destailleur
f7392871dd
Merge pull request #9579 from frederic34/patch-9
...
remove warning Line exceeds 500 characters
2018-09-21 09:40:28 +02:00
Philippe GRAND
bde8d8ae0e
Comment and typo
2018-09-21 09:32:50 +02:00
Philippe GRAND
c2e2395415
Comment and typo
2018-09-21 09:18:12 +02:00
Philippe GRAND
f59ac8dda5
Merge remote-tracking branch 'origin/new_branch_20_09_2018' into new_branch_21_09_2018
2018-09-21 09:07:17 +02:00
Philippe GRAND
e8b7ad0fb5
Standardize and update code
2018-09-21 08:49:05 +02:00
Laurent Destailleur
160e97616b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-20 23:43:51 +02:00
Laurent Destailleur
5bd538fb2c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/modStripe.class.php
htdocs/filefunc.inc.php
htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Frédéric FRANCE
042555e716
remove warning Line exceeds 500 characters
2018-09-20 20:44:17 +02:00
Laurent Destailleur
5a0ffb68d7
Merge pull request #9576 from atm-john/FIX_attribute_closing
...
FIX attribute closing
2018-09-20 20:34:57 +02:00
Laurent Destailleur
b05954fb1e
Merge pull request #9061 from delcroip/comptafiles
...
NEW: Page to check if the operations/itemw created between two dates have attached item(s) and possibility to download all attachements
2018-09-20 19:45:46 +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
e6a5c99b71
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-20 19:35:24 +02:00
Laurent Destailleur
36b8958c59
Move Stripe menu transactions and charges from develop to experimental
2018-09-20 19:35:13 +02:00
Laurent Destailleur
4ab6155b07
Merge pull request #9545 from ptibogxiv/patch-64
...
Fix link display
2018-09-20 19:27:00 +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
Laurent Destailleur
1601583fe2
Merge pull request #9574 from atm-john/NEW_task_selection_on_event_form
...
NEW : can add project's task to agenda on create event form
2018-09-20 18:59:18 +02:00
Ferran Marcet
4597cd44e5
FIX #9432
2018-09-20 17:52:44 +02:00
Philippe GRAND
67bbead7c1
Standardize and update code
2018-09-20 17:46:39 +02:00
Philippe GRAND
9c9f5bd3c3
Standardize and update code
2018-09-20 17:26:39 +02:00
Philippe GRAND
e1a03c49cf
Standardize and update code
2018-09-20 17:19:42 +02:00
Philippe GRAND
85ff212498
Standardize and update code
2018-09-20 17:11:29 +02:00
Philippe GRAND
ef95be1ed7
Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018
2018-09-20 17:10:48 +02:00
Laurent Destailleur
6ea7a6bce7
Try some fix to generate mandate
2018-09-20 17:09:31 +02:00
Philippe GRAND
e64fbd9522
Standardize and update code
2018-09-20 17:02:32 +02:00
Philippe GRAND
8225e039d9
Standardize and update code
2018-09-20 16:58:34 +02:00
Philippe GRAND
43edc64e7f
Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018
2018-09-20 16:57:10 +02:00
Laurent Destailleur
e0dfab4c71
FIX The max size for upload file was not corectly shown
2018-09-20 16:21:36 +02:00
Laurent Destailleur
c6470d49b0
FIX The max size for upload file was not corectly shown
2018-09-20 16:21:08 +02:00
John BOTELLA
b59b0b0cc3
FIX attribute closing
2018-09-20 16:13:22 +02:00
Philippe GRAND
6f18992bcc
Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018
2018-09-20 15:16:33 +02:00
Philippe GRAND
2adfdab771
Standardize and update code
2018-09-20 15:14:59 +02:00
Laurent Destailleur
497ab37204
css
2018-09-20 15:11:26 +02:00
Philippe GRAND
92a484dcd9
Standardize and update code
2018-09-20 15:07:43 +02:00
Laurent Destailleur
8793b9e26a
css
2018-09-20 15:07:42 +02:00
Maxime Kohlhaas
75104999d3
NEW PHPUnitTest on Loan class #3163
2018-09-20 15:04:00 +02:00
Philippe GRAND
7eda9c846c
Standardize and update code
2018-09-20 15:01:03 +02:00
Philippe GRAND
b7a4311802
Standardize and update code
2018-09-20 14:56:40 +02:00
Philippe GRAND
b1fa12e1e3
Standardize and update code
2018-09-20 14:51:09 +02:00
Philippe GRAND
49fe6d3b79
Standardize and update code
2018-09-20 14:43:54 +02:00
Laurent Destailleur
6793285997
Website
2018-09-20 14:38:18 +02:00
Laurent Destailleur
6e95fb5f05
Warning in website module
2018-09-20 14:36:13 +02:00
Philippe GRAND
7c92157636
Standardize and update code
2018-09-20 14:25:53 +02:00
Philippe GRAND
7903a64c36
Standardize and update code
2018-09-20 14:23:09 +02:00
Philippe GRAND
11f254cd14
Standardize and update code
2018-09-20 14:19:52 +02:00
Philippe GRAND
cf8e12ced2
Standardize and update code
2018-09-20 14:15:39 +02:00
Philippe GRAND
12b56d17ba
Standardize and update code
2018-09-20 14:11:59 +02:00
Philippe GRAND
0b4a0ac667
Standardize and update code
2018-09-20 14:09:25 +02:00
Philippe GRAND
4bd0af7a88
Standardize and update code
2018-09-20 14:05:57 +02:00
Philippe GRAND
bb0a830b78
Standardize and update code
2018-09-20 13:56:18 +02:00
Philippe GRAND
c0dc4f3a48
Standardize and update code
2018-09-20 13:52:57 +02:00
Philippe GRAND
7b50935e49
Standardize and update code
2018-09-20 13:44:45 +02:00
Philippe GRAND
a14c520910
Standardize and update code
2018-09-20 13:41:26 +02:00
Philippe GRAND
88bf2dee64
Standardize and update code
2018-09-20 13:36:00 +02:00
Philippe GRAND
7ffcc2e63f
Standardize and update code
2018-09-20 13:32:41 +02:00
Philippe GRAND
cbda62b1ca
Standardize and update code
2018-09-20 12:30:38 +02:00
Philippe GRAND
803505b6b7
Standardize and update code
2018-09-20 12:27:06 +02:00
Philippe GRAND
d091f5e16f
Standardize and update code
2018-09-20 12:21:49 +02:00
Philippe GRAND
50073fe98d
Standardize and update code
2018-09-20 12:16:31 +02:00
Philippe GRAND
bd87b1381d
Standardize and update code
2018-09-20 12:14:30 +02:00
Philippe GRAND
d2d40ef0a3
Standardize and update code
2018-09-20 12:12:37 +02:00
Philippe GRAND
4b51227ca9
Standardize and update code
2018-09-20 12:10:13 +02:00
Philippe GRAND
5979db7733
Standardize and update code
2018-09-20 12:07:23 +02:00
Philippe GRAND
d801374f93
Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018
2018-09-20 12:06:48 +02:00
Laurent Destailleur
9e01ea9180
css
2018-09-20 12:04:27 +02:00
Philippe GRAND
32beccc3be
Standardize and update code
2018-09-20 12:02:23 +02:00
Philippe GRAND
67147582af
Standardize and update code
2018-09-20 12:00:10 +02:00
Philippe GRAND
89b942ac9a
Standardize and update code
2018-09-20 11:34:18 +02:00
Philippe GRAND
d5a3411fbc
Standardize and update code
2018-09-20 11:28:54 +02:00
Philippe GRAND
08325d40ce
Standardize and update code
2018-09-20 11:18:02 +02:00
John BOTELLA
83d3e5ec39
NEW : can add project's task to agenda on create event card
2018-09-20 10:17:43 +02:00
Philippe GRAND
0222ea7e8c
Standardize and update code
2018-09-20 09:19:17 +02:00
Philippe GRAND
1adc4bad9e
Standardize and update code
2018-09-20 09:17:25 +02:00
Philippe GRAND
46d7385c54
Standardize and update code
2018-09-20 09:13:49 +02:00
Philippe GRAND
9b3dba4a56
Standardize and update code
2018-09-20 09:04:30 +02:00
Philippe GRAND
06ad6e7196
Standardize and update code
2018-09-20 09:04:12 +02:00
Philippe GRAND
9a487169c8
Standardize and update code
2018-09-20 09:03:52 +02:00
Philippe GRAND
ad84340bf5
Standardize and update code
2018-09-20 09:03:26 +02:00
Philippe GRAND
08b9c0c926
Missing translation
2018-09-20 09:02:54 +02:00
Laurent Destailleur
d4ffc5e088
css
2018-09-20 00:48:00 +02:00
Laurent Destailleur
4ca5bd696d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-19 20:28:27 +02:00
ptibogxiv
1a841b48ae
Update transaction.php
2018-09-19 20:15:12 +02:00
Laurent Destailleur
a546ef7f2d
FIX default day
2018-09-19 20:01:25 +02:00
ptibogxiv
203a2291ba
Update transaction.php
2018-09-19 19:05:46 +02:00
ptibogxiv
7e0bad97eb
Update transaction.php
2018-09-19 18:59:32 +02:00
Frédéric FRANCE
237f888356
Update api_thirdparties.class.php
2018-09-19 18:47:59 +02:00
Frédéric FRANCE
9ee88e9d35
remove superfluous spaces
2018-09-19 18:33:11 +02:00
Laurent Destailleur
19ec5103ad
css
2018-09-19 18:06:36 +02:00
Laurent Destailleur
55e3d97842
Trans
2018-09-19 17:56:51 +02:00
Laurent Destailleur
22053e0f4d
CSS
2018-09-19 17:53:24 +02:00
Laurent Destailleur
09a41fd757
Look and feel v8
2018-09-19 17:33:50 +02:00
Laurent Destailleur
92aa6929de
Fix go back on agenda view on correct page
2018-09-19 17:03:13 +02:00
Philippe GRAND
52533a0210
Standardize and update code
2018-09-19 16:43:37 +02:00
Philippe GRAND
7f59328eb7
Merge remote-tracking branch 'upstream/develop' into new_branch_19_09_2018
2018-09-19 16:43:01 +02:00
Laurent Destailleur
12b449fe49
It's easier to select fields to show on list
2018-09-19 16:41:33 +02:00
Philippe GRAND
bd3ba04e24
Standardize and update code
2018-09-19 16:36:08 +02:00
Philippe GRAND
57fc8cf06f
Standardize and update code
2018-09-19 16:31:36 +02:00
Philippe GRAND
30e426e487
Standardize and update code
2018-09-19 16:21:52 +02:00
Philippe GRAND
c9b8da8acb
Missing translation
2018-09-19 16:06:39 +02:00
Laurent Destailleur
ee788b543e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-19 15:06:42 +02:00
Laurent Destailleur
1d47569651
Brighter gradient
2018-09-19 15:06:14 +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
Laurent Destailleur
cde023148a
Merge pull request #9121 from yolocodefrench/develop
...
Generation of the mandate file from the api
2018-09-19 14:47:25 +02:00
Laurent Destailleur
f240cd130d
Update api_thirdparties.class.php
2018-09-19 14:47:11 +02:00
Laurent Destailleur
019ba74225
Update api_thirdparties.class.php
2018-09-19 14:44:16 +02:00
Laurent Destailleur
9d0594c0b4
Merge pull request #9559 from frederic34/ccharges
...
correct trimParameters
2018-09-19 14:29:10 +02:00
Laurent Destailleur
2643b6e1dd
Merge pull request #9558 from grandoc/new_branch_18_09_2018
...
Standardize and update code
2018-09-19 14:26:28 +02:00
Laurent Destailleur
7ca6b2603c
Trans
2018-09-19 12:25:07 +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
d35687c8b3
Work on module social network
2018-09-19 01:45:56 +02:00
Laurent Destailleur
2ec02afa8b
Fix nb of module
2018-09-19 01:14:55 +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
86bc1c813c
Fix warnings
2018-09-18 23:45:22 +02:00
Laurent Destailleur
7dba51c9a8
Fix warning
2018-09-18 23:39:49 +02:00
Laurent Destailleur
79b248fc67
FIX warning picto when next run date passed
2018-09-18 23:27:26 +02:00
Laurent Destailleur
8a43fe22cc
FIX warning picto when next run date passed
2018-09-18 23:25:38 +02:00
Frédéric FRANCE
126e5ae3ad
remove not needed require
2018-09-18 20:05:48 +02:00
Frédéric FRANCE
032f9729a5
correct trimParameters
2018-09-18 19:05:00 +02:00
Laurent Destailleur
014da6c22c
Fix translation
2018-09-18 18:11:07 +02:00
Philippe GRAND
83871468ba
Standardize and update code
2018-09-18 17:37:08 +02:00
Philippe GRAND
4536993fdc
Standardize and update code
2018-09-18 17:34:01 +02:00
Philippe GRAND
c3db591d7b
Standardize and update code
2018-09-18 17:31:01 +02:00
Philippe GRAND
73d161833a
Standardize and update code
2018-09-18 17:26:20 +02:00
Philippe GRAND
d021a3d5af
Standardize and update code
2018-09-18 17:24:10 +02:00
Philippe GRAND
30601accc3
Standardize and update code
2018-09-18 17:15:06 +02:00
Philippe GRAND
f28f3d12c2
Standardize and update code
2018-09-18 17:10:47 +02:00
Philippe GRAND
ac3efe1d5b
Standardize and update code
2018-09-18 17:06:25 +02:00
Philippe GRAND
ad6ecc6231
Standardize and update code
2018-09-18 16:49:20 +02:00
Philippe GRAND
71d8356f6a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_branch_18_09_2018
2018-09-18 16:48:32 +02:00
Philippe GRAND
b4692f0812
fix merge
2018-09-18 16:45:06 +02:00
Laurent Destailleur
99d214abd5
Fix family of module Payment of employee salaries
2018-09-18 16:38:51 +02:00
Philippe GRAND
c3bbe70e2d
fix merge
2018-09-18 16:38:14 +02:00
Laurent Destailleur
e2e3354807
Clean code
2018-09-18 16:35:38 +02:00
John BOTELLA
3fb2d4c159
remove change on text
2018-09-18 15:52:57 +02:00
Laurent Destailleur
4580ed0b09
Fix bad link
2018-09-18 15:31:25 +02:00
Laurent Destailleur
24279b71ef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-18 15:29:01 +02:00
Laurent Destailleur
34c130e715
Merge pull request #9551 from frederic34/patch-27
...
clean html donateur_code.php
2018-09-18 15:19:27 +02:00
Laurent Destailleur
2918d4dc9f
Merge pull request #9541 from frederic34/patch-23
...
reduce complexity of cronjob class
2018-09-18 15:18:28 +02:00
Laurent Destailleur
b67392b016
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-18 15:18:16 +02:00
Laurent Destailleur
52b6dd16da
Standardize code
2018-09-18 15:18:07 +02:00
Laurent Destailleur
eba0ce2f4f
Merge pull request #9540 from frederic34/patch-22
...
reduce complexity of contact class
2018-09-18 15:13:29 +02:00
Laurent Destailleur
b1d223069d
Merge pull request #9539 from frederic34/patch-21
...
reduce complexity of establishment class
2018-09-18 15:12:58 +02:00
Laurent Destailleur
03928a914d
Merge pull request #9537 from frederic34/patch-20
...
reduce complexity of actioncomm reminder class
2018-09-18 15:08:46 +02:00
Laurent Destailleur
2e7f853a8e
Merge pull request #9536 from frederic34/patch-19
...
reduce complexity of actioncomm class
2018-09-18 15:08:35 +02:00
Laurent Destailleur
6b8baab7b4
Merge pull request #9535 from frederic34/patch-18
...
reduce complexity of contrat class
2018-09-18 15:04:48 +02:00
Laurent Destailleur
61f5a2e899
Merge pull request #9533 from frederic34/trimParameters
...
trimParameters function
2018-09-18 15:04:32 +02:00
Laurent Destailleur
1c13fbb122
Merge pull request #9532 from frederic34/patch-17
...
reduce complexity of commoninvoice class
2018-09-18 15:03:25 +02:00
Laurent Destailleur
25d5200073
Merge pull request #9531 from frederic34/patch-16
...
reduce complexity of ProductStockEntrepot class
2018-09-18 15:03:04 +02:00
Laurent Destailleur
e65ec9f4ef
Merge pull request #9530 from frederic34/patch-15
...
reduce complexity of cchargesociales class
2018-09-18 15:02:44 +02:00
Laurent Destailleur
8c8c4bad21
Merge pull request #9529 from frederic34/patch-14
...
reduce complexity of user class
2018-09-18 15:02:24 +02:00
Laurent Destailleur
d72446cebc
Merge pull request #9528 from grandoc/new_branch_16_09_2018
...
New branch 16 09 2018
2018-09-18 15:01:23 +02:00
Laurent Destailleur
1a31071a5e
Merge pull request #9527 from frederic34/patch-11
...
clean datepicker
2018-09-18 15:00:52 +02:00
Laurent Destailleur
e6791e1763
Merge pull request #9526 from frederic34/patch-10
...
completely comment unused code
2018-09-18 14:59:55 +02:00
Laurent Destailleur
28f26f728a
Merge pull request #9553 from AXeL-dev/patch-1
...
Fix $heightforframes value to fit menu height on dolibarr 8
2018-09-18 14:59:34 +02:00
Laurent Destailleur
8c67e338eb
Merge pull request #9546 from frederic34/patch-26
...
clean stripe payment
2018-09-18 14:58:55 +02:00
Laurent Destailleur
dcc1c855fb
Merge pull request #9542 from frederic34/patch-24
...
reduce complexity of company lib
2018-09-18 14:58:17 +02:00
Laurent Destailleur
fa61ebeb9d
Merge pull request #9547 from grandoc/new_branch_17_09_2018
...
Standardize and update code
2018-09-18 14:57:50 +02:00
Laurent Destailleur
609c0c8b90
Merge pull request #9544 from ptibogxiv/patch-63
...
fix html
2018-09-18 14:57:26 +02:00
Laurent Destailleur
867850eadb
Merge pull request #9525 from frederic34/patch-9
...
reduce complexity societe class
2018-09-18 14:56:51 +02:00
Laurent Destailleur
1a1219ee2a
Trans
2018-09-18 14:52:50 +02:00
Laurent Destailleur
a8ecec68e7
css
2018-09-18 11:58:26 +02:00
Laurent Destailleur
85bed00474
Fix default fields
2018-09-18 11:50:04 +02:00
Laurent Destailleur
e07ce644e8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
2018-09-18 11:49:35 +02:00
Philippe GRAND
ad061f4e13
Standardize and update code
2018-09-18 11:14:21 +02:00
Philippe GRAND
c08f443f0a
Standardize and update code
2018-09-18 11:09:56 +02:00
Philippe GRAND
72f906683f
Standardize and update code
2018-09-18 11:02:18 +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
AXeL-dev
361f1c3d9a
fix $heightforframes value to fit menu height on dolibarr 8
2018-09-17 16:39:58 +01:00
Philippe GRAND
d1a27b33fb
Standardize and update code
2018-09-17 17:28:05 +02:00
Laurent Destailleur
1e36aba35f
Trans
...
Conflicts:
htdocs/langs/en_US/admin.lang
2018-09-17 16:42:44 +02:00
Laurent Destailleur
2f06e58237
css
2018-09-17 16:31:58 +02:00
Philippe GRAND
b06516180b
Standardize and update code
2018-09-17 15:06:41 +02:00
Philippe GRAND
cc5a8eb7d9
Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018
2018-09-17 15:03:27 +02:00
Laurent Destailleur
98f26bfcfb
NEW Can set 2 url in url field of thirdparty
2018-09-17 14:31:30 +02:00
Laurent Destailleur
3fc3cc4688
Fix missing email in popup
2018-09-17 14:17:10 +02:00
Laurent Destailleur
d717e28338
Trans
2018-09-17 14:15:30 +02:00
Frédéric FRANCE
20e245108f
clean html donateur_code.php
2018-09-17 13:12:04 +02:00
Laurent Destailleur
d872beb499
Fix css
2018-09-17 12:59:43 +02:00
Philippe GRAND
cd796bf682
Standardize and update code
2018-09-17 12:29:21 +02:00
Philippe GRAND
2a0ed0f14c
Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018
2018-09-17 12:27:36 +02:00
Laurent Destailleur
a75629e8e9
CSS
2018-09-17 12:25:49 +02:00
Laurent Destailleur
f3ce7cb5a5
Quick hack to provide help to fix pb of undesirable files
2018-09-17 10:40:42 +02:00
Philippe GRAND
484b36c5aa
Standardize and update code
2018-09-17 09:31:32 +02:00
Philippe GRAND
01ea6aee6c
Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018
2018-09-17 09:25:42 +02:00
Laurent Destailleur
0bf540b3c1
Fix regression in edition of date
2018-09-17 09:17:11 +02:00
Philippe GRAND
a1b15f170e
Standardize and update code
2018-09-17 09:00:23 +02:00
Laurent Destailleur
797de131a6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-17 02:26:15 +02:00
Laurent Destailleur
f3f18bf8cb
Fix sql
2018-09-17 02:23:11 +02:00
ptibogxiv
0770d8e56e
Update transaction.php
2018-09-16 23:14:22 +02:00
ptibogxiv
3c5a9326e1
Update transaction.php
2018-09-16 23:13:24 +02:00
Frédéric FRANCE
9cf6c6aeb4
clean stripe payment
2018-09-16 23:02:37 +02:00
ptibogxiv
38b23d2be4
Update charge.php
2018-09-16 22:55:50 +02:00
ptibogxiv
35f2f5f48c
Update transaction.php
2018-09-16 22:41:17 +02:00
ptibogxiv
7f4378870c
Fix link display
2018-09-16 22:39:38 +02:00
ptibogxiv
8c32ffd2e2
fix html
2018-09-16 22:36:58 +02:00
Laurent Destailleur
7fb2b1a769
Fix reset extrafields that must be unique when cloning
2018-09-16 22:30:13 +02:00
Laurent Destailleur
9415486059
Unique extrafields are reset when cloning contract
2018-09-16 22:13:29 +02:00
Frédéric FRANCE
aec1f779ff
reduce complexity of company lib
2018-09-16 21:40:28 +02:00
Frédéric FRANCE
0e0197f246
reduce complexity of cronjob class
2018-09-16 19:26:49 +02:00
Frédéric FRANCE
a4fd8c4b75
reduce complexity of contact class
2018-09-16 19:19:45 +02:00
Frédéric FRANCE
ad2d15bef1
reduce complexity of establishment class
2018-09-16 19:11:56 +02:00
Frédéric FRANCE
beb7a0609c
reduce complexity of actioncomm reminder class
2018-09-16 19:06:21 +02:00
Frédéric FRANCE
7b37c41cfb
reduce complexity of actioncomm class
2018-09-16 19:04:43 +02:00
Frédéric FRANCE
122275f2a7
reduce complexity of contrat class
2018-09-16 18:58:59 +02:00
wdammak
b17c44c665
Update html.form.class.php
...
Add the ability to sort products by category
2018-09-16 16:53:35 +01:00
Frédéric FRANCE
f935701d30
trimParameters
2018-09-16 15:35:19 +02:00
Frédéric FRANCE
b950043618
trimParameters
2018-09-16 15:16:08 +02:00
Laurent Destailleur
eeb919dcda
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 14:24:13 +02:00
Frédéric FRANCE
f9441d3249
Update commoninvoice.class.php
2018-09-16 14:07:11 +02:00
Frédéric FRANCE
6c8cbf710b
reduce complexity of ProductStockEntrepot class
2018-09-16 13:59:15 +02:00
Frédéric FRANCE
367e202df0
reduce complexity of cchargesociales class
2018-09-16 13:54:17 +02:00
Frédéric FRANCE
4120d0f92c
reduce complexity of user class
2018-09-16 13:49:22 +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
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +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
Philippe GRAND
9f35767b4b
Standardize and update code
2018-09-16 11:53:49 +02:00
Philippe GRAND
251273e3c3
Standardize and update code
2018-09-16 11:50:29 +02:00
Philippe GRAND
cd8e0aa919
Standardize and update code
2018-09-16 11:47:56 +02:00
Philippe GRAND
120f823065
Standardize and update code
2018-09-16 11:45:18 +02:00
Philippe GRAND
988774120c
Standardize and update code
2018-09-16 11:42:20 +02:00
Philippe GRAND
ab92871dc3
Standardize and update code
2018-09-16 11:37:43 +02:00
Philippe GRAND
8efe98b993
Standardize and update code
2018-09-16 11:31:54 +02:00
Philippe GRAND
90644222d8
Standardize and update code
2018-09-16 11:30:06 +02:00
Frédéric FRANCE
2f633857af
clean datepicker
2018-09-16 11:26:39 +02:00
Laurent Destailleur
f7c2bd877a
Comment dead code
2018-09-16 10:39:30 +02:00
Laurent Destailleur
10c6bc44ca
Fix scrutinizer
2018-09-16 10:28:41 +02:00
Laurent Destailleur
d6ee00f2e7
Fix constructors does not need return value
2018-09-16 10:22:23 +02:00
Laurent Destailleur
e90a60d4ee
Remove warnings
2018-09-16 10:09:19 +02:00
Laurent Destailleur
d9ffba72f0
Fix use fetch_object instead of fetch_array
2018-09-16 10:03:47 +02:00
Laurent Destailleur
2527127859
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 09:50:30 +02:00
Laurent Destailleur
eebd329c7c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modFacture.class.php
htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/main.lang
htdocs/stripe/transaction.php
2018-09-16 09:50:13 +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
Frédéric FRANCE
7b3b020533
completely comment unused code
2018-09-16 09:41:38 +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
Frédéric FRANCE
cb2d72d5c1
reduce complexity libstatut societe class
2018-09-16 09:22:49 +02:00
Laurent Destailleur
39419367b6
Merge pull request #9491 from frederic34/patch-11
...
reduce complexity of libstatut expedition.class.php
2018-09-16 08:56:02 +02:00
Laurent Destailleur
1aaf395831
Merge pull request #9524 from frederic34/patch-19
...
update code comment lettering class
2018-09-16 08:55:44 +02:00
Laurent Destailleur
de0355ac59
Merge pull request #9523 from frederic34/patch-18
...
reduce complexity libstatut adherent
2018-09-16 08:55:25 +02:00
Laurent Destailleur
2e7394efc0
Merge pull request #9522 from frederic34/patch-17
...
reduce complexity libstatut societe.account.class
2018-09-16 08:55:14 +02:00
Laurent Destailleur
62d4955db0
Merge pull request #9521 from frederic34/patch-16
...
reduce complexity of showWeather
2018-09-16 08:55:04 +02:00
Laurent Destailleur
48ff10e76f
Merge pull request #9520 from frederic34/patch-15
...
reduce complexity libstatut commande fournisseur class
2018-09-16 08:54:44 +02:00
Laurent Destailleur
bed8674714
Merge pull request #9519 from frederic34/patch-14
...
reduce complexity of libstatut inventory.class.php
2018-09-16 08:54:22 +02:00
Laurent Destailleur
949cd5f82f
Merge pull request #9518 from frederic34/patch-10
...
reduce complexity of libstatut product.class.php
2018-09-16 08:54:12 +02:00
Frédéric FRANCE
e8d2cb6135
update code comment lettering class
2018-09-16 08:39:43 +02:00
Frédéric FRANCE
4a57a75758
Merge branch 'develop' into patch-9
2018-09-16 08:09:18 +02:00
Frédéric FRANCE
8f5e5be01c
reduce complexity libstatut adherent
2018-09-16 08:06:17 +02:00
Frédéric FRANCE
e89ef9c3db
reduce complexity libstatut societe.account.class
2018-09-16 07:58:16 +02:00
Laurent Destailleur
6ba2127377
Merge pull request #9516 from grandoc/new_branch_15_09_2018
...
New branch 15 09 2018
2018-09-15 23:59:10 +02:00
Laurent Destailleur
856b1e7f40
Fix phpcs
2018-09-15 23:58:02 +02:00
Frédéric FRANCE
c15ccb0498
reduce complexity of showWeather
2018-09-15 22:38:16 +02:00
Frédéric FRANCE
fafa7f18b1
reduce complexity libstatut fournisseur.commande;class.php
2018-09-15 22:24:57 +02:00
Frédéric FRANCE
d2bd16280e
reduce complexity of libstatut inventory.class.php
2018-09-15 22:20:47 +02:00
Frédéric FRANCE
5d87847b65
reduce complexity of libstatut product.class.php
2018-09-15 22:13:54 +02:00
Philippe Grand
1d82825afa
Update html.formsms.class.php
2018-09-15 21:34:55 +02:00
Frédéric FRANCE
c86e734299
remove superfluous space
2018-09-15 21:06:33 +02:00
Laurent Destailleur
edb3671cf3
Merge pull request #9502 from frederic34/contractHookFormConfirm
...
NEW add hook formconfirm to contractcard
2018-09-15 17:31:56 +02:00
Laurent Destailleur
69dcdcbe75
Merge pull request #9509 from grandoc/new_branch_14_09_2018
...
Standardize and update code
2018-09-15 17:30:14 +02:00
Laurent Destailleur
75f3dd94c6
Merge pull request #9506 from frederic34/printing
...
printing remove no camelcaps function
2018-09-15 17:29:21 +02:00
Laurent Destailleur
e9159dda02
Merge pull request #9513 from ptibogxiv/patch-62
...
FIX link in connect mode
2018-09-15 17:28:35 +02:00
Laurent Destailleur
c587de4a3d
Merge branch 'develop' into stripetransac
2018-09-15 17:27:04 +02:00
Laurent Destailleur
4efab446d0
Merge pull request #9508 from frederic34/patch-15
...
reduce complexity of libstatut propal.class.php
2018-09-15 17:24:59 +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
1749c07ffe
Merge pull request #9496 from ptibogxiv/patch-61
...
Fix currency display in transaction.php
2018-09-15 17:07:27 +02:00
Laurent Destailleur
69a577f58d
Update transaction.php
2018-09-15 17:07:18 +02:00
Laurent Destailleur
ef2970a331
Merge pull request #9495 from ptibogxiv/patch-60
...
Fix currency display charge.php
2018-09-15 17:05:44 +02:00
Laurent Destailleur
2d0b4e5b5f
Merge pull request #9505 from frederic34/patch-14
...
Reduce complexity of libstatut asset.class.php
2018-09-15 17:02:16 +02:00
Laurent Destailleur
76cdbc8bf1
Merge branch 'develop' into testsqlAndScript
2018-09-15 17:01:23 +02:00
Laurent Destailleur
aacf5a0c86
Merge pull request #9490 from frederic34/patch-10
...
reduce complexity of libstatut loan.class.php
2018-09-15 17:00:04 +02:00
Laurent Destailleur
5eff159e27
Merge pull request #9489 from frederic34/patch-9
...
Completely comment unused code
2018-09-15 16:59:49 +02:00
Laurent Destailleur
5224f9ce56
Merge pull request #9488 from frederic34/patch-6
...
reduce complexity of libstatut don.class.php
2018-09-15 16:58:28 +02:00
Laurent Destailleur
f88dba91ab
Trans
2018-09-15 14:15:21 +02:00
Laurent Destailleur
bbfe4462dc
NEW Add lib for multiselect with checkboxes
...
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
2018-09-15 13:31:25 +02:00
Philippe GRAND
5c3a24a00c
Standardize and update code
2018-09-15 11:51:21 +02:00
Philippe GRAND
5910e1ddf8
Standardize and update code
2018-09-15 11:15:59 +02:00
Philippe GRAND
7deccb3215
Standardize and update code
2018-09-15 11:06:35 +02:00
Philippe GRAND
0654b7b0ef
Standardize and update code
2018-09-15 10:49:40 +02:00
Philippe GRAND
73c26a2d04
Standardize and update code
2018-09-15 10:47:50 +02:00
ptibogxiv
e0eb43909d
fix var
2018-09-14 17:57:47 +02:00
ptibogxiv
e9fb2387b0
link to stripe customer
2018-09-14 17:46:02 +02:00
ptibogxiv
362c9fd0b1
FIX link in connect mode
2018-09-14 15:38:38 +02:00
ptibogxiv
bf38f1a80f
fix url in connect mode
2018-09-14 15:27:43 +02:00
Philippe GRAND
fa1521d948
Standardize and update code
2018-09-14 15:09:23 +02:00
Philippe GRAND
ca9b1f155f
Standardize and update code
2018-09-14 14:05:19 +02:00
Philippe GRAND
6ec65ea580
Merge remote-tracking branch 'upstream/develop' into new_branch_14_09_2018
2018-09-14 13:54:46 +02:00
Laurent Destailleur
56b0a5f1ed
FIX Mixing tickets of different thirdparties
2018-09-14 13:07:27 +02:00
Philippe GRAND
33d9e24bd6
Standardize and update code
2018-09-14 11:58:49 +02:00
Laurent Destailleur
80fb1e0657
NEW Each user can set its prefered default calendar
2018-09-14 11:23:15 +02:00
ptibogxiv
5dcbfe0e56
fix $servicestatus
2018-09-14 11:18:37 +02:00
Philippe GRAND
18f4755a90
Standardize and update code
2018-09-14 10:20:21 +02:00
John BOTELLA
d1321e5a7b
change new PDF version
2018-09-14 09:54:39 +02:00
John BOTELLA
ec23cd0da4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_PDF_DOCUMENT_COLUMN_new_files
2018-09-14 09:54:14 +02:00
John BOTELLA
477acb2e4c
change new PDF version
2018-09-14 09:48:15 +02:00
Philippe Grand
51ba970eaf
Update html.formsms.class.php
2018-09-14 09:33:16 +02:00
Laurent Destailleur
16ed582124
Add comment
2018-09-14 01:45:03 +02:00
Laurent Destailleur
961505d510
NEW Add filter on staff range in list of thirdparties
2018-09-14 01:29:03 +02:00
Frédéric FRANCE
bcc9a3d259
reduce complexity of libstatut propal.class.php
2018-09-13 21:45:46 +02:00
Frédéric FRANCE
effde65e4e
Update asset.class.php
2018-09-13 20:42:06 +02:00
Laurent Destailleur
78e983a1f5
CSS v9
2018-09-13 16:39:50 +02:00
gauthier
7838b75ec9
FIX : wrong var name
2018-09-13 16:11:42 +02:00
Philippe GRAND
3da762a59d
Standardize and update code
2018-09-13 15:06:06 +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
Frédéric FRANCE
6744733730
add hook formconfirm to contractcard
2018-09-13 14:22:45 +02:00
Frédéric FRANCE
79cb1f5699
clean code
2018-09-13 13:57:01 +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
ptibogxiv
c36ee72de0
Update transaction.php
2018-09-13 11:32:52 +02:00
ptibogxiv
fad2502525
Update transaction.php
2018-09-13 11:31:39 +02:00
Frédéric FRANCE
5862a5e2ee
printing remove no camelcaps function
2018-09-13 11:13:32 +02:00
ptibogxiv
2ed0a72db5
Fix currency display in transaction.php
2018-09-13 11:10:58 +02:00
ptibogxiv
c620c64391
Fix currency display charge.php
2018-09-13 11:06:18 +02:00
Philippe GRAND
be3468241f
Standardize and update code
2018-09-13 10:55:05 +02:00
Philippe GRAND
ffad80eef6
Standardize and update code
2018-09-13 09:45:07 +02:00
Frédéric FRANCE
2c3e9e92b4
Update expedition.class.php
2018-09-12 22:59:15 +02:00
Frédéric FRANCE
05fc484d42
Update loan.class.php
2018-09-12 22:53:09 +02:00
Frédéric FRANCE
a128ea821e
Completely comment unused code
2018-09-12 22:49:32 +02:00
Frédéric FRANCE
c38239b6f9
Update don.class.php
2018-09-12 22:43:14 +02:00
Laurent Destailleur
ca85356b45
Merge pull request #9427 from frederic34/patch-6
...
deprecate Form::select_date
2018-09-12 22:07:23 +02:00
Laurent Destailleur
0b02673ba5
Merge pull request #9487 from frederic34/patch-5
...
Update categorie.class.php
2018-09-12 22:03:18 +02:00
Laurent Destailleur
b5b4410e75
Duplicate delete
2018-09-12 22:02:50 +02:00
Laurent Destailleur
b4264ee0a0
Use font awesome for sort image
2018-09-12 21:57:32 +02:00
Laurent Destailleur
765d8ec1fe
Better description
2018-09-12 21:33:48 +02:00
Laurent Destailleur
f46a137e25
Better description
2018-09-12 21:32:58 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Laurent Destailleur
c5e30b61c0
Fix translation
2018-09-12 21:25:14 +02:00
Laurent Destailleur
963d5eeddf
Merge pull request #9387 from frederic34/camelCaps2
...
start changing phpcs:ignore
2018-09-12 21:14:34 +02:00
Laurent Destailleur
b1d9846969
Merge pull request #9486 from grandoc/new_branch_12_09_2018
...
New branch 12 09 2018
2018-09-12 21:13:32 +02:00
Laurent Destailleur
b978c4114c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 21:12:27 +02:00
Laurent Destailleur
b3dec042b5
Fix translation
2018-09-12 21:12:15 +02:00
Frédéric FRANCE
04d3c7f43b
Update categorie.class.php
2018-09-12 21:07:54 +02:00
Laurent Destailleur
3dca02d25b
Fix translation
2018-09-12 21:07:34 +02:00
Laurent Destailleur
9d9e2bc3e3
Merge pull request #9405 from fmarcet/develop
...
NEW: Highlight lines on lists when they are checked
2018-09-12 20:50:42 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 20:21:35 +02:00
Laurent Destailleur
056ef802e4
Fix syntax error
2018-09-12 19:49:57 +02:00
ptibogxiv
ef4659c518
add capture option in payment function
...
Conflicts:
htdocs/stripe/class/stripe.class.php
2018-09-12 19:47:04 +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
Philippe GRAND
06cde1c35f
Standardize and update code
2018-09-12 19:32:30 +02:00
Philippe GRAND
04017367f9
Standardize and update code
2018-09-12 19:24:45 +02:00
Laurent Destailleur
82580cadf6
Merge pull request #9458 from frederic34/patch-17
...
Update account.class.php
2018-09-12 19:07:19 +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
Laurent Destailleur
7d726f9734
Merge pull request #9457 from frederic34/selectbarcodetype
...
Selectbarcodetype
2018-09-12 19:02:41 +02:00
ias-ceo
fece67b629
use correct resultset
2018-09-12 19:00:19 +02:00
Laurent Destailleur
cb174c3d1a
Merge pull request #9455 from IAS-SYSTEMS-CSC/develop
...
Fix : use correct resultset
2018-09-12 18:59:45 +02:00
Laurent Destailleur
ed2d215e19
Merge pull request #9467 from ptibogxiv/patch-59
...
update status display in charge list
2018-09-12 18:56:03 +02:00
Laurent Destailleur
71e4378bd2
Update charge.php
...
Charges can be done on different stripe account, even if doli thirdparty is same (if thirdparty has changed it stripe account). So keeping it in list seems usefull.
2018-09-12 18:51:03 +02:00
Laurent Destailleur
9efa3816c3
Update charge.php
2018-09-12 18:47:00 +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
88192d1bae
Merge pull request #9456 from frederic34/stripeuser
...
add stripe user for actions
2018-09-12 18:37:31 +02:00
Laurent Destailleur
fb71edd35a
Update ipn.php
2018-09-12 18:37:24 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Laurent Destailleur
e89ff94d74
Update stripe.lang
2018-09-12 18:35:47 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
358bc7ab1b
Merge pull request #9454 from frederic34/patch-16
...
Update dolreceiptprinter.class.php
2018-09-12 18:28: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
ad54159c85
Merge pull request #9485 from frederic34/patch-9
...
remove superfluous space
2018-09-12 18:25:17 +02:00
Laurent Destailleur
e0613e04db
Merge pull request #9446 from frederic34/patch-14
...
Update myobject.class.php
2018-09-12 18:24:55 +02:00
Laurent Destailleur
de8496773d
Merge pull request #9441 from grandoc/new_branch_09_09_2018
...
New branch 09 09 2018
2018-09-12 18:24:34 +02:00
Laurent Destailleur
6291f18179
Merge pull request #9440 from frederic34/patch-5
...
Upper Lower Casing
2018-09-12 18:24:02 +02:00
Frédéric FRANCE
6c17edd1d1
remove superfluous space
2018-09-12 18:23:58 +02:00
Laurent Destailleur
3bf296c9cf
Merge pull request #9448 from frederic34/loadfichetitre
...
remove deprecated
2018-09-12 18:23:24 +02:00
Laurent Destailleur
64d99dd302
Merge pull request #9459 from frederic34/patch-18
...
Completely comment unused code
2018-09-12 18:21:51 +02:00
ptibogxiv
79dd5e84d2
V8 style
2018-09-12 18:21:06 +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
81f4bae159
Merge pull request #9461 from grandoc/new_branch_11_09_2018
...
New branch 11 09 2018
2018-09-12 18:15:03 +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
b5d866f4d5
Merge pull request #9444 from frederic34/patch-11
...
Completely comment unused code
2018-09-12 18:14:22 +02:00
Laurent Destailleur
f5074f4962
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 18:12:17 +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
a3881bfbce
NEW hidden constant to be able to use a thirdparty for donation
2018-09-12 18:04:33 +02:00
Laurent Destailleur
2974ea72c4
Fix sql error
2018-09-12 17:45:38 +02:00
Laurent Destailleur
10becd2046
Merge pull request #9483 from ptibogxiv/patch-54
...
New donation module
2018-09-12 17:34:21 +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
da37302dc2
Merge pull request #9437 from grandoc/new_branch_08_09_2018
...
New branch 08 09 2018
2018-09-12 17:29:33 +02:00
Laurent Destailleur
bdcbc71ce9
Merge pull request #9443 from frederic34/patch-10
...
Completely comment unused code
2018-09-12 17:28:29 +02:00
Laurent Destailleur
f61afbab71
Merge pull request #9442 from frederic34/patch-9
...
completely comment unused code
2018-09-12 17:27:48 +02:00
ptibogxiv
50e40669bf
use thirdparty
2018-09-12 17:24:11 +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
Philippe GRAND
b8df44167a
Standardize and update code
2018-09-12 15:09:12 +02:00
Laurent Destailleur
729d03862f
Fix warning
2018-09-12 15:02:59 +02:00
Philippe GRAND
69bf43f851
Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018
2018-09-12 14:48:50 +02:00
Laurent Destailleur
5bd2c01411
Fix email missing in tooltip
2018-09-12 14:43:05 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Laurent Destailleur
72895bebbf
Add field twitter and facebook
2018-09-12 13:18:03 +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
ptibogxiv
30c393d2da
better display/link of informations
2018-09-12 11:28:43 +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
Laurent Destailleur
af2e19eba8
Replace skype module with social networks module to support more fields
2018-09-12 10:55:45 +02:00
Philippe GRAND
c51a0ef901
Standardize and update code
2018-09-12 10:10:07 +02:00
delcroix Patrick
2a4c65726c
new: delete zip after download
...
and correct date 2.0
2018-09-11 22:14:58 +02:00
delcroix Patrick
e36bc24dee
fix:copyrights
2018-09-11 21:55:05 +02:00
delcroix Patrick
e3920edb79
correct for invoice supplier links
2018-09-11 21:53:47 +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
Philippe GRAND
05772f5327
Standardize and update code
2018-09-11 17:30:43 +02:00
