Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

68347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe GRAND
743a61159d use loadLangs for translation files 2018-03-14 19:34:33 +01:00
Philippe GRAND
13ce041313 use loadLangs for translation files 2018-03-14 19:26:46 +01:00
Philippe GRAND
a5dc583906 use loadLangs for translation files 2018-03-14 19:10:22 +01:00
Laurent Destailleur
8c535db04c Use .... before end of card number 2018-03-14 17:15:31 +01:00
Laurent Destailleur
9994b1f133 Work on stripe interface 2018-03-14 17:12:32 +01:00
Laurent Destailleur
b232681318 NEW Add a button to create Stripe customer from the Payment mode tab 2018-03-14 16:53:16 +01:00
Laurent Destailleur
3f7cd8b1bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-14 13:56:41 +01:00
Laurent Destailleur
5c2a005e75 Work on generic customer payment modes 2018-03-14 13:56:21 +01:00
fmarcet
5140c1c5d2 Fix: Merge categories when merging thirds 2018-03-14 13:25:05 +01:00
ptibogxiv
e179161bfa FIX support for stripeconnect mode 2018-03-14 12:01:15 +01:00
Laurent Destailleur
268b07bcf0 Can add/delete credit card localy 2018-03-14 11:51:13 +01:00
ATM-Nicolas
e801b5a431 FIX : Delete tasks on project delete will now trigger TASK_DELETE 2018-03-14 11:38:42 +01:00
Ferran Marcet
4d4a204f7f Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-03-14 11:11:54 +01:00
Ferran Marcet
e47dda72e7 Fix: Activate all also if there are inactive services 2018-03-14 11:08:38 +01:00
Laurent Destailleur
cc9a6ee6e0 Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
 2018-03-14 10:49:54 +01:00
Laurent Destailleur
35fbcb2c84 Update company.lib.php 2018-03-14 10:48:56 +01:00
Laurent Destailleur
e7a315958d Merge pull request #8381 from fmarcet/7.0 
FIX Can't activate tasks on projects configuration
 2018-03-14 10:42:45 +01:00
Laurent Destailleur
8e58ef5ce2 Merge pull request #8380 from ptibogxiv/patch-20 
Fix IPN delete customer stripe with new database
 2018-03-14 10:38:49 +01:00
Ferran Marcet
304595ee4f Fix: Can't activate tasks on projects configuration 2018-03-14 09:48:39 +01:00
Sean Wang
9a1588df13 Add missing $mode in BookKeeping::createStd() 
In accountancy ledger, creating new transaction, there is
'ERROR: 55000: currval of sequence "llx_accounting_bookkeeping_rowid_seq"
is not yet defined in this session' occurred.

According to dolibarr.log, this error will show up after
createStd() {...Insert request to llx_accounting_bookkeeping_tmp...}.

It query the "llx_accounting_bookkeeping_rowid_seq" instead of
"llx_accounting_bookkeeping_tmp_rowid_seq",
due to missing $mode at bookkeeping.class.php
line504:last_insert_id().
 2018-03-14 16:38:22 +08:00
ptibogxiv
e62df03681 Fix delete customer stripe with new database 2018-03-14 08:59:05 +01:00
Laurent Destailleur
fe68e8acdd Trans 2018-03-13 22:54:28 +01:00
Laurent Destailleur
da617f7d32 Can work both with remote and local payment modes 2018-03-13 22:43:50 +01:00
Laurent Destailleur
c78e5d23ea Work on the customer payment mode tab 2018-03-13 20:23:59 +01:00
Laurent Destailleur
a86da671ba Remove verbose log 2018-03-13 18:13:31 +01:00
Laurent Destailleur
60283a8205 Remove file incoterm.lang 2018-03-13 18:07:58 +01:00
Laurent Destailleur
a1b03081f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 18:05:11 +01:00
Laurent Destailleur
0258d3aeeb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 18:04:59 +01:00
Laurent Destailleur
ca809a11af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/class/commande.class.php
 2018-03-13 18:04:18 +01:00
ptibogxiv
b3d0b892e5 NEW add internal stripe payment page for invoice 
WIP: dolibarize with new enhancements and functions
 2018-03-13 18:02:36 +01:00
Laurent Destailleur
6b2490f4e4 Merge pull request #8375 from atm-quentin/6.0 
FIX reverse field to have object loaded in doaction
 2018-03-13 17:56:06 +01:00
Laurent Destailleur
c923231d54 Merge pull request #8374 from ptibogxiv/patch-17 
Fix select by default gateway's icon
 2018-03-13 17:54:09 +01:00
Laurent Destailleur
43c8309fd7 Merge branch 'develop' into patch-17 2018-03-13 17:54:02 +01:00
Laurent Destailleur
3f490906f9 Trans 2018-03-13 17:52:15 +01:00
Laurent Destailleur
0a642a2656 Fix regression 2018-03-13 17:49:30 +01:00
Laurent Destailleur
2566170c68 Use code of societeaccount 2018-03-13 17:47:43 +01:00
Laurent Destailleur
944ba69cd8 Add unique key. Dolibarrize view of stripe card. 2018-03-13 17:32:49 +01:00
atm-quentin
af09a3714b FIX reverse field to have object loaded in doaction 2018-03-13 17:12:03 +01:00
ptibogxiv
1ff13cff7a Fix select by default gateway's icon 2018-03-13 15:43:11 +01:00
Laurent Destailleur
f88536068f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-13 15:30:07 +01:00
Laurent Destailleur
17b7c6268e FIX avoid "Array" on screen 2018-03-13 15:29:52 +01:00
Laurent Destailleur
a955e74329 Better MVC 2018-03-13 15:19:31 +01:00
Laurent Destailleur
9c92e09295 Fix syntax 2018-03-13 14:48:01 +01:00
Laurent Destailleur
f7dd7e89de Add option to create stripe customer if not found (so we can use 
function to find without side effect)
 2018-03-13 14:44:35 +01:00
Laurent Destailleur
a658f7c455 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 14:27:35 +01:00
Laurent Destailleur
b1ac4246a1 Merge pull request #8373 from ptibogxiv/patch-16 
ADD trigger when modify, delete thirdparty
 2018-03-13 14:20:33 +01:00
Laurent Destailleur
59b7187501 Rename interface_99_modStripe_Stripe.class.php to interface_80_modStripe_Stripe.class.php 2018-03-13 14:20:23 +01:00
Laurent Destailleur
4b7f4d29d1 Update interface_99_modStripe_Stripe.class.php 2018-03-13 14:19:26 +01:00
Laurent Destailleur
d6e8872af4 Update interface_99_modStripe_Stripe.class.php 2018-03-13 14:14:33 +01:00
Laurent Destailleur
b25f3ba322 Fix to avoid stripe live mode beeing disabled when stripeconnect off 2018-03-13 14:13:32 +01:00