Commit Graph

6714 Commits

Author SHA1 Message Date
Laurent Destailleur
0345c00f0a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-05 16:45:10 +01:00
Laurent Destailleur
bb315a6f12 Fix trans 2019-02-05 16:44:10 +01:00
Laurent Destailleur
d49dd8d593 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-05 15:16:44 +01:00
Laurent Destailleur
541f6e537e Fix link to pay membership renewal 2019-02-05 14:05:39 +01:00
Laurent Destailleur
b58c49d0bb Trans 2019-02-05 13:59:23 +01:00
Laurent Destailleur
d6501d996c Missing trans 2019-02-05 13:56:55 +01:00
Laurent Destailleur
48ab519841 Fix typo 2019-02-03 21:40:56 +01:00
Laurent Destailleur
5a6e46a9c3 Doc 2019-02-03 21:40:23 +01:00
andreubisquerra
8b1b8bb7a3 CSS improvements and Takepos setup check 2019-02-02 23:57:38 +01:00
Laurent Destailleur
28c1b1ce58 Work on billing time spent 2019-02-01 22:39:36 +01:00
Laurent Destailleur
9d03f4b228 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-01 18:17:02 +01:00
Laurent Destailleur
b83ff06db8 FIX #10416 No need of another option 2019-02-01 17:00:04 +01:00
Laurent Destailleur
eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/members.lang
	htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +01:00
Laurent Destailleur
b14a16a119 Code comment 2019-02-01 13:48:09 +01:00
Laurent Destailleur
c05628c746 Fix edit member module setup 2019-01-31 20:27:55 +01:00
Laurent Destailleur
4c31749f4b Add tooltip on setup 2019-01-31 11:11:56 +01:00
Laurent Destailleur
d0b20178e0 Merge pull request #10442 from aspangaro/10.0_accountancy_default
NEW: When you create product or service, sell accountancy account by default are proposed
2019-01-30 16:30:13 +01:00
Laurent Destailleur
7983a85bb2 Update accountancy.lang 2019-01-30 16:29:45 +01:00
Laurent Destailleur
60fa8d08c2 Merge pull request #10456 from aspangaro/10.0_Ledger_improve_import
FIX: FEC Compatibility for import in ledger
2019-01-30 15:01:02 +01:00
Alexandre SPANGARO
1b675ba0b6 FIX: FEC Compatibility for import in ledger 2019-01-30 09:51:29 +01:00
Alexandre SPANGARO
64975b3b9e NEW: When you create product or service, sell accountancy account by default are proposed 2019-01-28 22:27:55 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
andreubisquerra
bec25fb45c Remove absolut divs and add Dolistore POS category link to TakePOS 2019-01-27 01:28:32 +01:00
Laurent Destailleur
f313791e57 Merge pull request #10400 from andreubisquerra/master
Bills and coins pad, or Num pad in TakePOS
2019-01-26 13:55:45 +01:00
Laurent Destailleur
cfa850cd20 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-26 01:32:00 +01:00
Laurent Destailleur
2c8557e2e0 Work on invoicing of time spent 2019-01-24 18:16:14 +01:00
Laurent Destailleur
c95b915db3 Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0 2019-01-24 07:07:31 +01:00
Laurent Destailleur
ecb16cf914 Trans 2019-01-24 07:07:26 +01:00
andreubisquerra
5b3559418f Bills and coins pad, or Num pad in TakePOS 2019-01-23 20:59:34 +01:00
Laurent Destailleur
f9686c47af Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/website/index.php
2019-01-23 19:22:42 +01:00
Laurent Destailleur
ad54a2b8af Fix website edit of virtualhost 2019-01-23 15:06:28 +01:00
Laurent Destailleur
e33f102dc2 FIX Edit of virtualhost 2019-01-23 14:57:43 +01:00
Laurent Destailleur
ccbec3d29f Fix typo 2019-01-22 16:27:23 +01:00
Laurent Destailleur
51bdf5f949 Fix trans 2019-01-22 16:06:20 +01:00
Laurent Destailleur
c26f264cac Merge pull request #10369 from mwelters/mwelters/addays
Add configurable days to SEPA Withdrawal  Execution Date
2019-01-20 19:47:57 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime
Fix
2019-01-19 13:22:38 +01:00
Philippe GRAND
59cfa02bdb missing translation 2019-01-18 16:21:06 +01:00
markus
de9b8f427d Add configurable days to SEPA Withdrawal Execution Date 2019-01-18 16:16:55 +01:00
Laurent Destailleur
971670da8d Clean language file 2019-01-18 14:24:49 +01:00
Laurent Destailleur
ab5aaa6b43 Start debug compta-files 2019-01-17 00:32:43 +01:00
Laurent Destailleur
c357cb8c4e Clean code 2019-01-16 12:42:54 +01:00
Laurent Destailleur
d6b0f852c5 Work on invoicing time spent 2019-01-15 21:01:01 +01:00
Laurent Destailleur
48e7fcd821 Remove not used keys 2019-01-13 16:55:46 +01:00
Laurent Destailleur
ab3365440c Fix translation 2019-01-13 16:51:34 +01:00
Laurent Destailleur
653acf556b Fix translation Customer order into Sales order 2019-01-10 12:15:42 +01:00
Laurent Destailleur
22d4afbb62 Missing trans 2019-01-10 01:54:06 +01:00
Laurent Destailleur
126e02798a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
527ef8bdc8 Add nb of invoice to help cash fence 2019-01-07 19:02:38 +01:00
Laurent Destailleur
1403ac3cc1 Trans 2019-01-07 18:07:56 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00