lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
70,549 Commits 43 Branches 150 Tags 886 MiB
4571210bcf
Commit Graph

61645 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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