Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

9416 Commits

Author SHA1 Message Date
Alexandre SPANGARO
61547e3f82 NEW Manage account sell_intra & sell_export in page default product 2019-05-03 14:08:20 +02:00
Laurent Destailleur
dd4e70efe7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/accountancy/class/lettering.class.php
 2019-05-03 12:14:17 +02:00
Laurent Destailleur
e694d0b2c2 Merge pull request #11101 from aspangaro/9.0_lettering 
FIX Massive debug in lettering function
 2019-05-03 11:39:45 +02:00
Laurent Destailleur
eab49d4300 NEW Update Stripe library to 6.34.3 2019-05-03 02:22:27 +02:00
Laurent Destailleur
10d853cdb3 Work on stripe payment using intent with option 
STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
 2019-05-02 21:54:28 +02:00
Laurent Destailleur
8442c86436 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/index.php
 2019-05-02 17:40:41 +02:00
Laurent Destailleur
4899d03ff8 FIX Confusion between expired and late 2019-05-02 17:15:24 +02:00
Alexandre SPANGARO
cbe23741eb FIX Massive debug in lettering function 2019-05-02 14:06:55 +02:00
Laurent Destailleur
e2c7c0574e Merge pull request #11086 from andreubisquerra/master 
NEW Add history to view and print previous sales on TakePos.
 2019-05-02 14:04:57 +02:00
Laurent Destailleur
a75223c850 Debug ticket module 2019-05-02 13:53:13 +02:00
Laurent Destailleur
e81f10c790 Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION 2019-05-02 13:45:49 +02:00
Laurent Destailleur
4a81e8fd62 Debug call to apilayer 2019-05-02 13:24:28 +02:00
Laurent Destailleur
4756499a81 Debug module builder for generation of APIs 2019-05-02 12:03:14 +02:00
Laurent Destailleur
90a1181dc5 Debug module Ticket 2019-05-01 20:41:03 +02:00
Laurent Destailleur
9955af5194 Debug ticket module 2019-05-01 17:53:41 +02:00
Laurent Destailleur
61bf731d17 FIX Balance of td 2019-04-30 18:11:35 +02:00
Laurent Destailleur
0cd1fc79f2 NEW Add a security permission to edit php dynamic content on website. 2019-04-30 13:05:13 +02:00
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:30:40 +02:00
Laurent Destailleur
c12a16abea Fix trans 2019-04-30 02:49:13 +02:00
Laurent Destailleur
d55c440740 Fix some product and services export profiles 2019-04-29 21:23:01 +02:00
Laurent Destailleur
c7fcecc336 Fix email not loaded 2019-04-29 17:17:25 +02:00
andreubisquerra
00db274956 Add history to view and print previous sales. 2019-04-28 18:12:33 +02:00
Laurent Destailleur
0c432c28a8 Trans 2019-04-26 13:08:19 +02:00
Laurent Destailleur
4bd732cc40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export.php
	htdocs/core/class/utils.class.php
	htdocs/langs/en_US/website.lang
 2019-04-25 23:25:21 +02:00
Laurent Destailleur
63c0ab93fb FIX CVE-2019-11201 2019-04-25 23:21:25 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
e5c2027dbb NEW Add accounting code for eec sales and export sales on products 2019-04-25 01:16:29 +02:00
Laurent Destailleur
fe3fe60efc Cleaner setup page 2019-04-24 18:31:11 +02:00
Laurent Destailleur
4d92d7731c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php
 2019-04-23 12:32:08 +02:00
Laurent Destailleur
09914f31f9 Trans 2019-04-23 12:14:50 +02:00
Laurent Destailleur
c0b12ee94a Typo 2019-04-22 12:24:21 +02:00
Alexandre SPANGARO
3729e32368 Assets - Debug - Look & field v10 2019-04-18 14:13:48 +02:00
Alexandre SPANGARO
660a1cea1d NEW Accounting - Add rights on export, delete operations in ledger 2019-04-17 07:26:39 +02:00
Laurent Destailleur
8d18915746 Work on edit link of expense report line and files 2019-04-12 18:18:04 +02:00
Laurent Destailleur
b2da5cedbc Translation 2019-04-11 21:09:07 +02:00
Laurent Destailleur
a3782f7060 Transifex sync 2019-04-11 16:08:50 +02:00
Laurent Destailleur
203cbd56c2 Finished debug of emailcollector module 2019-04-10 17:35:33 +02:00
Laurent Destailleur
4f2a3d6bdd Debug ticket module 2019-04-10 16:23:16 +02:00
Laurent Destailleur
2eeb4b8734 Debug ticket module 2019-04-10 15:45:55 +02:00
Laurent Destailleur
26594fab98 Debug module ticket 2019-04-10 15:11:38 +02:00
Laurent Destailleur
1f6f6f6edb Track action close for ticket 2019-04-10 13:21:06 +02:00
Laurent Destailleur
ff629b2355 NEW Color for hover and for checked line is on by default 2019-04-09 15:57:26 +02:00
Laurent Destailleur
f9860e1425 Work on email collector 2019-04-09 13:23:30 +02:00
Laurent Destailleur
c0b3ee23e5 Fix phpcs 2019-04-08 23:50:18 +02:00
Laurent Destailleur
65e931cfe2 Work on email collector 2019-04-08 21:22:10 +02:00
Laurent Destailleur
36aa53e88d Missing trans 2019-04-08 19:40:52 +02:00
Laurent Destailleur
1b415a6aed Fix translation of help tooltip on fields for modulebuilder. 2019-04-08 14:42:46 +02:00
Laurent Destailleur
2b87c8b663 Merge pull request #10810 from mwelters/patch-1 
NEW improve Expensereport, Inverse Receiver
 2019-04-08 14:04:08 +02:00
Laurent Destailleur
a7ced8ab5d Merge pull request #10963 from aspangaro/v10_p3 
NEW: Accounting - Invert module name
 2019-04-08 13:39:51 +02:00