Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,061 Commits 36 Branches 189 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

71061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
b809bff31d Merge pull request #9777 from frederic34/patch-9 
fix syntax error and phpcs
 2018-10-16 21:52: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
594d8569a9 Merge pull request #9758 from frederic34/payloan 
clean loan code
 2018-10-16 19:43:40 +02:00
Laurent Destailleur
d57e55387d Merge branch 'develop' into payloan 2018-10-16 19:43:34 +02:00
Laurent Destailleur
330824748b Merge pull request #9750 from frederic34/patch-16 
code comment
 2018-10-16 19:37:32 +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
23ffac3bf2 Merge pull request #9770 from Dolibarr/revert-9764-patch-71 
Revert "FIX and dolibarize"
 2018-10-16 19:21:35 +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