Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

8581 Commits

Author SHA1 Message Date
Laurent Destailleur
91b3ffc3da Merge pull request #8409 from aspangaro/8.0-a10 
NEW Add a tab to specify accountant/auditor of the company
 2018-03-19 12:40:44 +01:00
Laurent Destailleur
12068f9cf3 Merge branch 'develop' into 8.0-a7 2018-03-19 12:18:18 +01:00
Laurent Destailleur
2ae1bb26c5 Update compta.lang 2018-03-19 12:14:43 +01:00
Laurent Destailleur
f46df6d8e5 Can resize and crop images in the ticketsup module 2018-03-19 11:49:05 +01:00
Laurent Destailleur
6ca40bcbd4 Fix translation 2018-03-19 11:01:44 +01:00
Laurent Destailleur
9aa4a90543 NEW Stripe online payments reuse the same stripe customer account 2018-03-19 10:57:19 +01:00
Laurent Destailleur
7e488c7ccd Trans 2018-03-18 22:11:30 +01:00
Laurent Destailleur
e55c90b015 Fix translation 2018-03-18 20:29:36 +01:00
Laurent Destailleur
1bb4f3e07a Dolibarrize module ticket 2018-03-18 20:20:10 +01:00
Laurent Destailleur
af44af0235 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-18 20:01:27 +01:00
Laurent Destailleur
d4ae0395ed NEW Look and feel v8: Use a different picto for delete and unlink 2018-03-18 19:13:42 +01:00
Laurent Destailleur
0c1e0f38d8 Merge pull request #8404 from OPEN-DSI/project_add_close_to_mass_update 
NEW Add mass action on project's list to close projects
 2018-03-18 12:28:03 +01:00
Alexandre SPANGARO
17b98b84ad Merge remote-tracking branch 'uptream/develop' into 8.0-a10 2018-03-18 06:11:05 +01:00
Alexandre SPANGARO
93b087dbe0 NEW Add a tab to specify accountant/auditor of the company 2018-03-18 06:09:50 +01:00
Laurent Destailleur
7b71e29fa0 Duplicate translation 2018-03-17 15:17:35 +01:00
philippe-opendsi
452c9e22bb Add mass action on project's list to close projects 2018-03-16 15:24:49 +01:00
Laurent Destailleur
9997a6c787 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-16 12:20:42 +01:00
Laurent Destailleur
a94017ba25 FIX letter for month March 2018-03-16 00:07:00 +01:00
Laurent Destailleur
46fb2945d4 NEW Show keyboard shortcut of nav arrow into tooltip 2018-03-15 22:02:03 +01:00
Laurent Destailleur
c9566e9501 Merge pull request #8392 from aspangaro/8.0-a9 
NEW Add stats in salaries module
 2018-03-15 14:28:35 +01:00
Laurent Destailleur
620ceb54e3 Clean code to avoid confusion 2018-03-15 14:25:09 +01:00
Laurent Destailleur
d804764134 Standardize look and feel 2018-03-15 10:41:43 +01:00
Alexandre SPANGARO
9ce6ab915c Merge remote-tracking branch 'uptream/develop' into 8.0-a9 2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc NEW Add stats in salaries module 2018-03-15 06:23:20 +01:00
Laurent Destailleur
852bf8dab7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/societe/class/societe.class.php
 2018-03-15 01:57:35 +01:00
Laurent Destailleur
4957ea9178 Fix SQLi reported by op7ica 2018-03-15 01:55:16 +01:00
Laurent Destailleur
cca1a58249 Can create card from dolibarr 2018-03-15 00:18:43 +01:00
Laurent Destailleur
bf4a0e46aa Add a credit card on stripe 2018-03-14 21:07:45 +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
5c2a005e75 Work on generic customer payment modes 2018-03-14 13:56:21 +01:00
Laurent Destailleur
268b07bcf0 Can add/delete credit card localy 2018-03-14 11:51:13 +01:00
Laurent Destailleur
fe68e8acdd Trans 2018-03-13 22:54:28 +01:00
Laurent Destailleur
c78e5d23ea Work on the customer payment mode tab 2018-03-13 20:23:59 +01:00
Laurent Destailleur
60283a8205 Remove file incoterm.lang 2018-03-13 18:07:58 +01:00
Laurent Destailleur
3f490906f9 Trans 2018-03-13 17:52:15 +01:00
Laurent Destailleur
e6dd312bd5 Debug ticket module 2018-03-13 13:56:45 +01:00
Laurent Destailleur
8048259733 Work on ticket module integration 2018-03-13 12:13:47 +01:00
Laurent Destailleur
f2bba8fb03 Fix translation 2018-03-12 20:11:34 +01:00
Laurent Destailleur
78b0585798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/taxes.php
 2018-03-12 19:09:57 +01:00
Laurent Destailleur
cbbaf4763b Start to introduce thirdparty website accounts 2018-03-12 16:04:23 +01:00
Laurent Destailleur
7362b3f3d7 Add table to store thirparty account in external web sites 2018-03-12 15:59:03 +01:00
Laurent Destailleur
98b7d4c2e2 NEW Can set the start/end date of service line in invoice templates 2018-03-12 12:27:40 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
Laurent Destailleur
6da3fbe3c9 Translation 2018-03-11 23:21:14 +01:00
Laurent Destailleur
51c94fadfa Look and feel v7 2018-03-11 21:31:34 +01:00
Frédéric FRANCE
b04d38e760 Update ticketsup.lang 2018-03-11 20:16:06 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
dfb3d1b3bc Merge pull request #8325 from inoveaconseil/develop 
Add execution date on direct debit
 2018-03-10 22:11:58 +01:00
Inovea Conseil
975300b90b Add execution date on prelevement 2018-03-10 11:23:35 +01:00
Frédéric FRANCE
27bf5419d6 Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00