lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94,075 Commits 43 Branches 150 Tags 886 MiB
8f9ef87838
Commit Graph

94075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
8f9ef87838 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/banks.lang
 2021-01-24 15:38:38 +01:00
Laurent Destailleur
21dccadb3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:32:39 +01:00
Laurent Destailleur
33903cb5c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-24 15:30:10 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
7365974594 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:24:56 +01:00
Laurent Destailleur
8bbf6ce577
Merge pull request #16045 from aspangaro/13a30 
FIX: Accountancy - Search_not_reconciled
 2021-01-24 15:20:58 +01:00
Laurent Destailleur
97aba6d767
Merge pull request #16052 from ptibogxiv/patch-405 
Fix stripe Payment method delete
 2021-01-24 15:20:04 +01:00
Laurent Destailleur
9a754625bd
Merge pull request #16053 from ptibogxiv/patch-406 
Fix stripe off_session set/unset
 2021-01-24 15:17:41 +01:00
Laurent Destailleur
15f79bad2a
Merge pull request #16054 from frederic34/TVA_to_Tva 
fix class name Tva
 2021-01-24 15:16:46 +01:00
Laurent Destailleur
7c583ce631
Merge pull request #16056 from ptibogxiv/patch-407 
ADD new payment method for stripe
 2021-01-24 15:16:21 +01:00
Laurent Destailleur
c5cda97c19 FIX Generation of aliases (main alias and alt alias into subdirs) 2021-01-24 14:34:29 +01:00
Laurent Destailleur
005292054d FIX Generation of aliases (main alias and alt alias into subdirs) 2021-01-24 14:31:29 +01:00
stickler-ci
c9dd854c2c Fixing style errors. 2021-01-24 12:40:36 +00:00
ptibogxiv
25de393685
Update stripe.php 2021-01-24 13:38:23 +01:00
ptibogxiv
4765d7fb4f
Update stripe.class.php 2021-01-24 13:38:03 +01:00
ptibogxiv
4857a04acd
ADD new payment method for stripe 
still in development (work for support more payment modes)
 2021-01-24 13:37:05 +01:00
Laurent Destailleur
d9908efdef Code comment 2021-01-24 13:29:38 +01:00
Laurent Destailleur
0203965fbf Fix typo 2021-01-24 13:29:26 +01:00
Laurent Destailleur
15b818da30 Code comment 2021-01-24 13:27:52 +01:00
Laurent Destailleur
332db70fca Fix typo 2021-01-24 13:04:02 +01:00
Frédéric FRANCE
5820758968
fix class name Tva 2021-01-23 20:59:23 +01:00
Laurent Destailleur
c5bbaffb50 Fix look and feel v13 2021-01-23 19:50:04 +01:00
ptibogxiv
ae2b61d5ef
Fix stripe off_session set/unset 2021-01-23 18:49:11 +01:00
Laurent Destailleur
b4783f69d6 Show if permission is an advanced permission 2021-01-23 18:13:50 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Laurent Destailleur
f7e637a552 Trans 2021-01-23 17:40:14 +01:00
Laurent Destailleur
6d0cbd3ee5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-23 17:32:49 +01:00
Laurent Destailleur
f2c4e25827 Clean code 2021-01-23 17:32:14 +01:00
Laurent Destailleur
21e55d1542 NEW Can filter files in GED on status Shared/Not shared 2021-01-23 13:56:51 +01:00
Laurent Destailleur
8bd7ddee6b Clean code 2021-01-23 13:55:56 +01:00
Laurent Destailleur
791f5f3f62 Fix css 2021-01-23 13:50:06 +01:00
ptibogxiv
89219a37a6
Fix stripe Payment method delete 2021-01-23 13:24:00 +01:00
Laurent Destailleur
9b6b1e055c Fix trans 2021-01-23 12:20:18 +01:00
Laurent Destailleur
86e853f27d Look and feel v12 2021-01-23 12:18:07 +01:00
Laurent Destailleur
2acf2353a3 Fix bad link 2021-01-23 12:16:25 +01:00
Alexandre SPANGARO
77a43c51f9 FIX: Accountancy - Search_not_reconciled 2021-01-22 15:10:23 +01:00
Laurent Destailleur
7e8d06e8b8 Fix update default contact type 2021-01-22 14:10:08 +01:00
Laurent Destailleur
599d69b07c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00
Laurent Destailleur
d23e6646ed
Merge pull request #16030 from atm-adrien/FIX/Linked_extrafields_10.0 
FIX : Linked extrafields lists
 2021-01-22 13:35:56 +01:00
Laurent Destailleur
93ca27d808 FIX #16041 2021-01-22 13:17:27 +01:00
Laurent Destailleur
ad2f5ea7c1 Update website template 2021-01-22 12:39:59 +01:00
Laurent Destailleur
242a0a54be Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-22 10:52:07 +01:00
Laurent Destailleur
cf11f356e8 Fix load of data are not complete 2021-01-22 10:51:47 +01:00
Laurent Destailleur
641e2d9906
Merge pull request #16042 from aspangaro/13a29 
Accountancy - Gestimum v3 / v5 Added a sort to excluse line at zero
 2021-01-22 02:20:16 +01:00
Laurent Destailleur
5cd80015db
Merge pull request #16044 from frederic34/supplier_proposal_extrafields_keys 
add missing index in extrafields tables of supplier proposal
 2021-01-22 02:10:29 +01:00
Laurent Destailleur
d368b3c7d6
Merge pull request #16046 from atm-john/new/manifest_use_squared_img 
NEW : manifest use squared image or custom
 2021-01-22 02:05:35 +01:00
Laurent Destailleur
79fb672674 Sync transifex 2021-01-22 01:47:29 +01:00
Laurent Destailleur
b25f65c995 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/projet/info.php
 2021-01-22 01:09:35 +01:00