Commit Graph

35763 Commits

Author SHA1 Message Date
Grand Philippe
ea296d8429 fix error translation 2013-03-22 19:24:26 +01:00
Grand Philippe
07940d719b fix error translation 2013-03-22 13:00:26 +01:00
Laurent Destailleur
305c436983 Merge pull request #765 from grandoc/develop
display enhancement and normalize
2013-03-22 03:28:00 -07:00
Grand Philippe
371c7194fa display enhancement and standardize 2013-03-22 11:15:52 +01:00
Grand Philippe
12f1d1b6dd display enhancement and standardize 2013-03-22 11:11:18 +01:00
Grand Philippe
e506601214 display enhancement and standardize 2013-03-22 10:48:14 +01:00
Laurent Destailleur
945c511a5b Qual: Clean code 2013-03-22 10:27:36 +01:00
Grand Philippe
b44d5de58e display enhancement and normalize 2013-03-22 09:38:48 +01:00
Grand Philippe
1730d9e2b7 display enhancement and normalize 2013-03-22 09:30:04 +01:00
Laurent Destailleur
3863b70b0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-22 00:02:42 +01:00
Laurent Destailleur
4949d74267 New: Add a tab "consumption" on thirdparties to list products
bought/sells.
(i implement list for customer invoices and supplier orders, need
someone to finish work for customer orders and supplier invoices)
2013-03-22 00:02:25 +01:00
Laurent Destailleur
e4bd3c45d9 Merge pull request #764 from grandoc/develop
fix :constant error
2013-03-21 06:00:11 -07:00
Grand Philippe
3e8ebb953d fix :constant error 2013-03-21 13:38:38 +01:00
Laurent Destailleur
aeb3573d21 Merge pull request #763 from grandoc/develop
display enhancement and standardize
2013-03-21 04:07:41 -07:00
Grand Philippe
45d9d525a4 display enhancement and standardize 2013-03-21 09:22:26 +01:00
Grand Philippe
5192794aab display enhancement and standardize 2013-03-21 08:47:45 +01:00
Grand Philippe
c389d75ede display enhancement and standardize 2013-03-21 08:39:17 +01:00
Grand Philippe
40c889955b display enhancement and standardize 2013-03-21 08:22:24 +01:00
Laurent Destailleur
5b6a12d011 Merge pull request #762 from grandoc/develop
fix sql error
2013-03-20 15:01:00 -07:00
Grand Philippe
a3ad06134a display enhancement and standardize 2013-03-20 22:34:53 +01:00
Grand Philippe
cb23777469 fix sql error 2013-03-20 22:21:22 +01:00
Laurent Destailleur
a2763df9e7 Qual: Start to clean the simple accountancy moule. 2013-03-20 21:41:16 +01:00
Laurent Destailleur
257f6da8f4 New: Add field to make accountancy dispatch module easier to build.
Must match module customer invoice.
2013-03-20 20:34:30 +01:00
Laurent Destailleur
a3435ab889 Merge remote-tracking branch 'origin/3.3' into develop 2013-03-20 15:32:32 +01:00
Laurent Destailleur
7f4fd06f19 Merge pull request #761 from cbattarel/3.3
fix getting buying price when creating automatically an order from a proposal
2013-03-20 07:31:31 -07:00
Laurent Destailleur
a326995c37 New: Add info when option ADHERENT_VAT_FOR_SUBSCRIPTIONS is off. 2013-03-20 14:29:26 +01:00
Laurent Destailleur
e407426b13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-20 14:22:43 +01:00
Laurent Destailleur
df28716e27 Show date of subscript + date of creation of subscription (may differ) 2013-03-20 14:22:28 +01:00
eldy
a635f88992 Look: Minir fix 2013-03-20 11:08:54 +01:00
Christophe Battarel
c7666cbc3d fix getting buying price when creating automatically an order from a proposal (with first option activated in workflow module) 2013-03-20 09:30:13 +01:00
Laurent Destailleur
720eb8b7dd Merge pull request #760 from defrance69/patch-18
Update fiche.php
2013-03-19 19:27:14 -07:00
Laurent Destailleur
fd680b6b68 Merge pull request #759 from cbattarel/contrat_propal
can now create contract from signed propal
2013-03-19 19:26:54 -07:00
Laurent Destailleur
6b4e32bd9b Merge pull request #758 from grandoc/develop
fix: deprecated for expedition_methode_id
2013-03-19 19:25:29 -07:00
Laurent Destailleur
f4996b4054 Merge pull request #757 from cbattarel/3.3
remove experimental commissions module
2013-03-19 19:18:38 -07:00
Grand Philippe
a76594c296 standardize and simplify code and enhance display 2013-03-19 19:57:42 +01:00
BENKE Charles
fa21a1d5de Update fiche.php
vrong url to fiche project
2013-03-19 18:56:39 +01:00
Grand Philippe
5c87a4ff56 standardize and simplify code and enhance display 2013-03-19 17:20:54 +01:00
Grand Philippe
4f2ff1642b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-19 15:24:13 +01:00
Laurent Destailleur
bf912e2c78 Fix: Some bug into supplier pdf invoice setup. 2013-03-19 15:19:31 +01:00
Grand Philippe
d541bc874d Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-19 08:37:34 +01:00
Christophe Battarel
d4ecb93014 can now create contract from signed propal 2013-03-18 18:44:57 +01:00
Grand Philippe
fb75358c10 fix: deprecated for expedition_methode_id 2013-03-18 17:34:29 +01:00
Christophe Battarel
e2f28b6c51 remove experimental commissions module 2013-03-18 15:40:56 +01:00
Laurent Destailleur
8a6adb8a49 Merge pull request #756 from cbattarel/3.3
various fixes on margin :
2013-03-18 06:25:54 -07:00
Christophe Battarel
f8291a9efe use ifsql function 2013-03-18 14:18:17 +01:00
Christophe Battarel
e59084cafc various fixes on margin :
- fix on sortorder
- fix for credit notes
- fix for total
2013-03-18 13:04:08 +01:00
Laurent Destailleur
45a6717dd3 Merge pull request #752 from FHenry/develop
task #768  &  task #769
2013-03-18 05:02:38 -07:00
fhenry
9e46a55bbf Taking account remark on pull request 2013-03-17 22:26:06 +01:00
Laurent Destailleur
c6b4259735 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-17 19:40:41 +01:00
Laurent Destailleur
7703537b96 New: Work on cron module 2013-03-17 19:39:53 +01:00