lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
57,699 Commits 43 Branches 150 Tags 886 MiB
4e43a815d1
Commit Graph

57699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4e43a815d1 Merge pull request #6359 from aspangaro/6.0-3 
Fix : [FP17] Correct some problems on category accounting account page
 2017-02-02 01:02:49 +01:00
Laurent Destailleur
f15295d4bc Merge pull request #6350 from aspangaro/6.0-chartofaccounts 
New : [FP17] Accountancy - Add select field in list of accounts
 2017-02-02 01:02:30 +01:00
Laurent Destailleur
c3fb559d3b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modProduct.class.php
 2017-02-01 20:58:17 +01:00
Laurent Destailleur
9b37b52f45 Fix css 2017-02-01 20:55:30 +01:00
Laurent Destailleur
924a08a078 Fix code should use 5.0 framework 2017-02-01 16:24:40 +01:00
Laurent Destailleur
fbbf8cd8a4 Fix bad side effect of uniformizing a constant name. 2017-02-01 15:47:08 +01:00
Laurent Destailleur
d945a0de92 NEW Uniformize behaviour: Action to make order is an action button. 2017-02-01 14:59:51 +01:00
Laurent Destailleur
9a9b31c9c0 Fix cancel button + logic to close project when setting opp to WON/LOST. 2017-02-01 13:25:16 +01:00
aspangaro
2ce4ba99fe Fix : [FP17] Correct some fix on category accounting account page 2017-02-01 06:54:01 +01:00
Laurent Destailleur
fbf9986506 Fix translation 2017-01-31 18:03:25 +01:00
Laurent Destailleur
2db372d99d Fix css 2017-01-31 16:17:24 +01:00
Laurent Destailleur
aaa2e393c3 Fix css 2017-01-31 16:17:10 +01:00
Laurent Destailleur
373f918543 Fix css 2017-01-31 16:14:56 +01:00
Laurent Destailleur
218e49298a Uniformize field names 2017-01-31 14:10:06 +01:00
Laurent Destailleur
4cec071af5 Add tms field 2017-01-31 14:00:53 +01:00
aspangaro
e1e2c49d93 NEW : [FP17] Accountancy - Add select field in list of accounts 2017-01-31 06:08:40 +01:00
Laurent Destailleur
f16e65c6b1 Fix css 2017-01-30 12:22:58 +01:00
Laurent Destailleur
5e4509953d Associated product must be on another export profile 2017-01-29 21:25:29 +01:00
Laurent Destailleur
45263c85ec Fix in emailing 2017-01-29 20:33:08 +01:00
Laurent Destailleur
ff8b7e6e4d Fix size of email 2017-01-29 18:35:56 +01:00
Laurent Destailleur
92e61e6707 Fix hide url if not defined 2017-01-29 18:29:37 +01:00
Laurent Destailleur
45c99d9d24 Fix HTML5 error 2017-01-29 16:46:59 +01:00
Laurent Destailleur
d7c2bdba38 Fix: link was useless with a nofollow tag. 2017-01-29 16:42:59 +01:00
Laurent Destailleur
756919de2a Fix deadlock feature: could not solve a situation where an emailing was 
validated by error.
 2017-01-29 16:08:45 +01:00
Laurent Destailleur
b4b81d8dcb Fix css and missing translation key 2017-01-29 15:07:18 +01:00
Laurent Destailleur
24c21cca27 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-28 15:56:27 +01:00
Laurent Destailleur
4f76626f51 FIX Creation of credit note on invoice with deposit stole the discount. 2017-01-28 15:55:44 +01:00
Laurent Destailleur
fd90bf466b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/societe/soc.php
 2017-01-28 15:12:14 +01:00
Laurent Destailleur
2c07d2df22 Add comments 2017-01-28 15:08:46 +01:00
Laurent Destailleur
c88e63ecc9 FIX #6259 2017-01-28 15:01:17 +01:00
Laurent Destailleur
e2ce31e1a7 Add code comment 2017-01-28 14:54:51 +01:00
Laurent Destailleur
1e78c4c418 FIX Change the customer code only if error on duplicate 2017-01-28 14:54:06 +01:00
Laurent Destailleur
7c638feb3b Fix label of field 2017-01-28 13:13:57 +01:00
Laurent Destailleur
bc8ccd8ec5 Fix bad var set 2017-01-28 13:01:10 +01:00
Laurent Destailleur
4bce208035 FIX detail of deposit and credit not was not visible into final invoice 2017-01-28 12:42:02 +01:00
Laurent Destailleur
27caa586c2 Fix auto increment customer code must be done only if error is on 
duplicate code
 2017-01-28 12:36:53 +01:00
Laurent Destailleur
10bacda820 Prepare migration 5-6 2017-01-27 13:56:16 +01:00
Laurent Destailleur
fcfea4e6d1 Add missing field fk_user_modif 2017-01-27 13:26:31 +01:00
Laurent Destailleur
68711184b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-27 13:23:41 +01:00
Laurent Destailleur
8d9639cd09 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-27 13:23:21 +01:00
Laurent Destailleur
63f614d1d5 Fix color switching threshold 2017-01-27 13:22:36 +01:00
Laurent Destailleur
87a74e78b6 Merge pull request #6246 from atm-florian/develop 
NEW : supplier invoice : calculation of limit payment date on update
 2017-01-27 01:46:43 +01:00
Laurent Destailleur
f919f70096 Merge branch 'develop' into develop 2017-01-27 01:46:21 +01:00
Laurent Destailleur
c48400331f Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date 
NEW get multicurrency rate from document date (propal, order)
 2017-01-27 01:32:52 +01:00
Laurent Destailleur
119d0c3938 Merge pull request #6231 from IonAgorria/mail-lines 
#NEW: Add email template for each line in object
 2017-01-27 01:30:53 +01:00
Laurent Destailleur
29df2c9115 Merge branch 'develop' into mail-lines 2017-01-27 01:29:58 +01:00
Laurent Destailleur
70091eceed Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2017-01-27 01:26:11 +01:00
Laurent Destailleur
0c14e1d233 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-27 01:24:55 +01:00
Laurent Destailleur
025036595d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-01-27 01:23:56 +01:00
Laurent Destailleur
8a4e957554 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-01-27 01:23:44 +01:00