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

5094 Commits

Author SHA1 Message Date
Philippe GRAND
d811934962 fix conflict 2020-08-08 14:57:43 +02:00
Laurent Destailleur
cab9f6daae Comment must be in english 2020-08-08 13:22:55 +02:00
Laurent Destailleur
0dda5ca4d6 Fix experimental 2020-08-07 16:27:09 +02:00
Laurent Destailleur
aa422ce4d7
Merge branch 'develop' into develop 2020-08-07 12:05:32 +02:00
Laurent Destailleur
d8e38201d9
Merge pull request #14378 from grandoc/patch-5 
Update pdf_crabe.modules.php
 2020-08-07 11:42:12 +02:00
Laurent Destailleur
a2e4e2d3b2
Merge pull request #14380 from grandoc/patch-6 
Update pdf_blochet.class.php
 2020-08-07 11:41:44 +02:00
Laurent Destailleur
9320ba1b37
Merge pull request #14376 from grandoc/patch-3 
Update pdf_rouget.modules.php
 2020-08-07 11:41:28 +02:00
Laurent Destailleur
07564166c7
Merge pull request #14375 from grandoc/patch-2 
Update pdf_merou.modules.php
 2020-08-07 10:11:16 +02:00
Laurent Destailleur
84c80e50a0
Merge pull request #14374 from grandoc/patch-1 
Update pdf_ban.modules.php
 2020-08-07 10:10:58 +02:00
Laurent Destailleur
8b69dd1384 Increase length of default password. 2020-08-07 09:50:15 +02:00
Laurent Destailleur
9d79e984dd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
 2020-08-06 02:15:04 +02:00
Laurent Destailleur
2fd430bd2c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 02:08:44 +02:00
Laurent Destailleur
375fe3f3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/fourn/paiement/card.php
 2020-08-06 02:08:04 +02:00
Laurent Destailleur
9cb5735165 FIX Bad address used for vendor on PDF standard of supplier payment 2020-08-06 02:05:55 +02:00
Laurent Destailleur
1cf3422e05 FIX Bad adress of vendor in PDF for PDF of supplier payment 
FIX dol_convertToWord() Bad conversion of number into a string
 2020-08-06 01:56:42 +02:00
Philippe Grand
eed8957e07
Update pdf_blochet.class.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:33:52 +02:00
Philippe Grand
8d2edfc5ab
Update pdf_crabe.modules.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:13:08 +02:00
Philippe Grand
8483d4609c
Update pdf_rouget.modules.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:05:32 +02:00
Philippe Grand
7e519da8df
Update pdf_merou.modules.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:00:59 +02:00
Philippe Grand
e368de9bba
Update pdf_ban.modules.php 2020-08-04 16:55:47 +02:00
Philippe Grand
bc86518020
Update pdf_aurore.modules.php 2020-08-04 16:13:35 +02:00
Philippe Grand
6a24aed42a
Update pdf_standard.modules.php 2020-08-04 16:12:21 +02:00
Philippe Grand
c6b4c4392c
Update pdf_muscadet.modules.php 2020-08-04 16:11:25 +02:00
Philippe Grand
79be00f0aa
Update pdf_cornas.modules.php 2020-08-04 16:10:06 +02:00
Philippe Grand
62c49b2ce3
Update pdf_canelle.modules.php 2020-08-04 16:08:43 +02:00
Philippe Grand
49c99cfa70
Update pdf_squille.modules.php 2020-08-04 16:07:21 +02:00
Philippe Grand
4d1743ffcf
Update pdf_cyan.modules.php 2020-08-04 16:06:01 +02:00
Philippe Grand
f4a4444c79
Update pdf_azur.modules.php 2020-08-04 16:04:54 +02:00
Philippe Grand
54878e2916
Update pdf_timespent.modules.php 2020-08-04 16:03:28 +02:00
Philippe Grand
d9c260c7f1
Update pdf_beluga.modules.php 2020-08-04 16:02:19 +02:00
Philippe Grand
81b484ecc8
Update pdf_baleine.modules.php 2020-08-04 16:01:28 +02:00
Philippe Grand
d781a7cf62
Update pdf_espadon.modules.php 2020-08-04 16:00:12 +02:00
Philippe Grand
e8f92fe5bc
Update pdf_standard.class.php 2020-08-04 15:59:23 +02:00
Philippe Grand
6937efa3ba
Update pdf_typhon.modules.php 2020-08-04 15:57:25 +02:00
Philippe Grand
ea72d5dc82
Update pdf_soleil.modules.php 2020-08-04 15:56:17 +02:00
Philippe Grand
51cbbcd3b8
Update pdf_sponge.modules.php 2020-08-04 15:55:14 +02:00
Philippe Grand
d97a9c9b0d
Update pdf_crabe.modules.php 2020-08-04 15:53:20 +02:00
Philippe Grand
85879a0baa
Update pdf_standard.modules.php 2020-08-04 15:51:35 +02:00
Philippe Grand
001662af3d
Update pdf_rouget.modules.php 2020-08-04 15:49:47 +02:00
Philippe Grand
19fb6e827e
Update pdf_merou.modules.php 2020-08-04 15:47:00 +02:00
Philippe Grand
f94d4413a9
Update pdf_espadon.modules.php 2020-08-04 15:45:52 +02:00
Philippe Grand
3fcacf7196
Update pdf_blochet.class.php 2020-08-04 15:44:25 +02:00
Philippe Grand
2627bec686
Update pdf_sepamandate.modules.php 2020-08-04 15:43:28 +02:00
Philippe Grand
6874feb09a
Update pdf_ban.modules.php 2020-08-04 15:42:14 +02:00
Philippe Grand
e4faa0228e
Update pdf_strato.modules.php 2020-08-04 15:40:42 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Laurent Destailleur
c78b19b3b8 Move module as experimental (it is working enough). 2020-08-03 16:39:52 +02:00
Laurent Destailleur
fa26d2acdf css 2020-08-03 16:31:52 +02:00
Laurent Destailleur
aa696d8343 Show warning in kanban view 2020-08-03 15:17:37 +02:00
Laurent Destailleur
d1f92fb66b NEW: Add module Credit transfer SEPA to manage payment of supplier using 
bank credit transfer SEPA files
 2020-08-03 14:15:14 +02:00
Philippe GRAND
42fcb64700 Change comment to fixe a lot of undefined method 2020-08-03 10:26:01 +02:00
Philippe GRAND
85b2adaaec Change comment to fixe a lot of undefined method 2020-08-03 10:13:18 +02:00
Philippe GRAND
0d6274c8fe Change comment to fixe a lot of undefined method 2020-08-03 10:04:54 +02:00
Philippe GRAND
d6c84ef5ce Change comment to fixe a lot of undefined method 2020-08-03 10:02:25 +02:00
Philippe GRAND
6fa3e8df4e Change comment to fixe a lot of undefined method 2020-08-03 10:00:20 +02:00
Philippe GRAND
3a2e527454 Change comment to fixe a lot of undefined method 2020-08-03 09:58:47 +02:00
Philippe GRAND
1ea21ee1b8 Change comment to fixe a lot of undefined method 2020-08-03 09:56:48 +02:00
Philippe GRAND
d446a38b34 Change comment to fixe a lot of undefined method 2020-08-03 09:54:19 +02:00
Philippe GRAND
9fd520b5d4 Change comment to fixe a lot of undefined method 2020-08-03 09:52:11 +02:00
Philippe GRAND
3b80e9a08e Change comment to fixe a lot of undefined method 2020-08-03 09:50:30 +02:00
Philippe GRAND
8ff27f89e5 Change comment to fixe a lot of undefined method 2020-08-03 09:48:25 +02:00
Philippe GRAND
703de5286f Change comment to fixe a lot of undefined method 2020-08-03 09:46:07 +02:00
Philippe GRAND
ed6d83687c Change comment to fixe a lot of undefined method 2020-08-03 09:44:44 +02:00
Philippe GRAND
2c4d8bceb6 Change comment to fixe a lot of undefined method 2020-08-03 09:39:54 +02:00
Philippe GRAND
c7bf47a00b Change comment to fixe a lot of undefined method 2020-08-03 09:38:05 +02:00
Philippe GRAND
857505a887 Change comment to fixe a lot of undefined method 2020-08-03 09:36:23 +02:00
Philippe GRAND
0e0adcbe43 Change comment to fixe a lot of undefined method 2020-08-03 09:33:19 +02:00
Philippe GRAND
38f4e0392d Change comment to fixe a lot of undefined method 2020-08-03 09:30:31 +02:00
Philippe GRAND
8bdf15a6a6 Change comment to fixe a lot of undefined method 2020-08-03 09:28:25 +02:00
Philippe GRAND
83d1ff2a6c Change comment to fixe a lot of undefined method 2020-08-03 09:25:17 +02:00
Philippe GRAND
0b75280104 Change comment to fixe a lot of undefined method 2020-08-03 09:19:55 +02:00
Philippe GRAND
ccb9d62a14 Change comment to fixe a lot of undefined method 2020-08-03 09:13:46 +02:00
Laurent Destailleur
93fea8591c Fix phpcs 2020-07-24 12:17:02 +02:00
Laurent Destailleur
6e36fba4f3 NEW Development of module Recruitment 2020-07-24 11:54:57 +02:00
Laurent Destailleur
acdb61b640
Merge pull request #14227 from defrance/patch-154 
NEW : add class for ticket edition (pdf or odt)
 2020-07-19 02:11:13 +02:00
BENKE Charlene
a2cf473891
add class for ticket edition (pdf or odt) 2020-07-13 14:24:07 +02:00
Philippe GRAND
5902dd6df3 Minimum version of PHP required by module 2020-07-11 15:10:53 +02:00
Philippe GRAND
2906e9b848 Minimum version of PHP required by module 2020-07-11 15:10:26 +02:00
Philippe GRAND
fc778e433f Minimum version of PHP required by module 2020-07-11 15:10:02 +02:00
Philippe GRAND
8c5bdb8fb6 Minimum version of PHP required by module 2020-07-11 15:09:36 +02:00
Philippe GRAND
3ee18e5852 Minimum version of PHP required by module 2020-07-11 15:09:15 +02:00
Philippe GRAND
1d5a1beb79 Minimum version of PHP required by module 2020-07-11 15:08:52 +02:00
Philippe GRAND
1bb60ca7cc Minimum version of PHP required by module 2020-07-11 15:08:28 +02:00
Philippe GRAND
1358801316 Minimum version of PHP required by module 2020-07-11 15:08:00 +02:00
Philippe GRAND
b4252b899c Minimum version of PHP required by module 2020-07-11 15:07:33 +02:00
Philippe GRAND
9451148928 Minimum version of PHP required by module 2020-07-11 15:07:09 +02:00
Philippe GRAND
bbde5a3c95 Minimum version of PHP required by module 2020-07-11 15:06:44 +02:00
Philippe GRAND
05b97dc134 Minimum version of PHP required by module 2020-07-11 15:06:17 +02:00
Philippe GRAND
eb602d8bae Minimum version of PHP required by module 2020-07-11 15:05:49 +02:00
Philippe GRAND
2e6addae11 Minimum version of PHP required by module 2020-07-11 15:05:20 +02:00
Philippe GRAND
f453c2272a Minimum version of PHP required by module 2020-07-11 15:04:54 +02:00
Philippe GRAND
3a4f526ccd Minimum version of PHP required by module 2020-07-11 15:04:31 +02:00
Philippe GRAND
8f37bb5a69 Minimum version of PHP required by module 2020-07-11 15:04:06 +02:00
Philippe GRAND
d4562a91ff Minimum version of PHP required by module 2020-07-11 15:03:38 +02:00
Philippe GRAND
8d06471a4e Minimum version of PHP required by module 2020-07-11 15:03:00 +02:00
Philippe GRAND
b26a1042d2 Minimum version of PHP required by module 2020-07-11 15:02:03 +02:00
Philippe GRAND
b2af2320ef Merge branch 'new_branch_11_07_2020' of github.com:grandoc/dolibarr into new_branch_11_07_2020 2020-07-11 14:57:26 +02:00
Philippe GRAND
a61955234f Minimum version of PHP required by module 2020-07-11 14:54:23 +02:00
Philippe GRAND
b02b6db181 Minimum version of PHP required by module 2020-07-11 14:43:30 +02:00
Philippe GRAND
8a2db6bad5 Minimum version of PHP required by module 2020-07-11 14:42:53 +02:00
stickler-ci
0d58c55167 Fixing style errors. 2020-07-11 12:42:38 +00:00
Philippe GRAND
ece128c9c5 Minimum version of PHP required by module 2020-07-11 14:42:04 +02:00
Philippe GRAND
7c84406494 Minimum version of PHP required by module 2020-07-11 14:41:10 +02:00
Philippe GRAND
370a7bcf38 Minimum version of PHP required by module 2020-07-11 14:39:46 +02:00
Philippe GRAND
0531dd00d9 Minimum version of PHP required by module 2020-07-11 14:38:44 +02:00
Philippe GRAND
baa9c39ace Minimum version of PHP required by module 2020-07-11 14:38:03 +02:00
Philippe GRAND
872b99be42 Minimum version of PHP required by module 2020-07-11 14:37:25 +02:00
Philippe GRAND
0fdb209045 Minimum version of PHP required by module 2020-07-11 14:36:22 +02:00
Philippe GRAND
7f5ebf2e31 Minimum version of PHP required by module 2020-07-11 14:35:36 +02:00
Philippe GRAND
c9c5d9cc70 Minimum version of PHP required by module 2020-07-11 14:34:11 +02:00
Philippe GRAND
fd01a4d154 Minimum version of PHP required by module 2020-07-11 14:31:16 +02:00
Laurent Destailleur
b2bd90ae1a Fix link to list of event 2020-07-09 12:33:28 +02:00
Laurent Destailleur
146c521efd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/filefunc.inc.php
 2020-06-29 18:06:42 +02:00
Laurent Destailleur
5b3670f300 FIX SQL syntax error when editing extrafields 
Conflicts:
	htdocs/core/lib/security.lib.php
 2020-06-29 14:28:53 +02:00
Laurent Destailleur
7c5b0be6a3 FIX SQL syntax error when editing extrafields 2020-06-29 13:48:00 +02:00
Laurent Destailleur
7c4e737668 Clean code 2020-06-29 09:53:55 +02:00
Laurent Destailleur
a5893db106 FIX upload documents into manual ECM was reported a permission error 2020-06-28 22:05:55 +02:00
lvessiller
3eb695ffa8 NEW add region in export companies and contacts 2020-06-26 09:14:06 +02:00
Laurent Destailleur
c36c8ed447 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
 2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/fourn/class/paiementfourn.class.php
 2020-06-17 14:53:24 +02:00
Laurent Destailleur
7d3c176727 Prepare convertion of field "montant" into "amount" 2020-06-17 12:45:56 +02:00
Laurent Destailleur
6ea4928c79
Merge pull request #14090 from ATM-Consulting/FIX_11.0_missing_currency_columns_in_supplier_exports 
11.0 - FIX - missing currency columns in supplier exports
 2020-06-16 22:00:56 +02:00
Florian Mortgat
18d5ec7750 11.0 - FIX - missing currency columns in supplier exports 
(copy-pasted from modFacture.class.php)
 2020-06-16 10:56:10 +02:00
Laurent Destailleur
72130dacb9
Merge pull request #14061 from atm-gauthier/10.0_fix_progress_pdf 
FIX : percent must be displayed on one line
 2020-06-12 14:50:49 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/class/ticket.class.php
 2020-06-11 23:39:26 +02:00
Laurent Destailleur
2109a91992 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/takepos/admin/setup.php
 2020-06-11 23:36:55 +02:00
gauthier
92b89437d1 FIX : percent must be displayed on one line 2020-06-09 16:02:41 +02:00
Florian Mortgat
0a2099e0ac FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat 2020-06-09 14:22:32 +02:00
Laurent Destailleur
9a30d4ca44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:02 +02:00
Laurent Destailleur
c6a53d9b3d
Update pdf_blochet.class.php 2020-06-02 12:09:11 +02:00
DEMAREST Maxime (Indelog)
7189e060e0 Fix line heiht overflow for blochet template 
Fixed if by adding dynamic line height calculation. Now line height depend on
bank field content or transmitter field content. You can use long text in this
fields.
 2020-06-02 11:17:37 +02:00
Laurent Destailleur
c8d0476728 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
 2020-06-01 04:09:52 +02:00
Laurent Destailleur
dbac97a908 Fix several troubles into numbering modules. 
Prefix for takepos moved from TK to TC (TK was already used for tasks)
 2020-06-01 04:02:47 +02:00
Laurent Destailleur
156f09729e Debug module Payment by credit transfer 2020-05-30 02:10:41 +02:00
Laurent Destailleur
0a8b90c4e8 Debug module Payment by credit transfer 2020-05-30 02:10:02 +02:00
Laurent Destailleur
3b22b6192d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 21:36:08 +02:00
Laurent Destailleur
2e0cf05e55 phpcs 2020-05-28 21:20:30 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
 2020-05-28 20:20:39 +02:00
Laurent Destailleur
3606ed2bda Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2020-05-28 20:17:26 +02:00
Laurent Destailleur
8360ca4b20
Update pdf_crabe.modules.php 2020-05-28 17:38:20 +02:00
Laurent Destailleur
bdc73b5cae
Update pdf_crabe.modules.php 2020-05-28 17:37:53 +02:00
atm-lena
edc6abcea8 FIX Rounding Total TVA in "crabe" model pdf 2020-05-28 15:19:37 +02:00
Laurent Destailleur
e787978890 Doc 2020-05-27 23:12:26 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Laurent Destailleur
d8d5907aff
Merge pull request #13939 from grandoc/develop 
Fix : some comment and translation
 2020-05-23 15:11:32 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-22 08:27:12 +02:00