lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,743 Commits 43 Branches 150 Tags 886 MiB
cb23777469
Commit Graph

35743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
d0449768f7 Use div instead of table 2013-03-17 19:31:13 +01:00
Laurent Destailleur
c4b86bd9dc Merge pull request #755 from grandoc/develop 
normalize
 2013-03-17 10:00:07 -07:00
Grand Philippe
294b4865d1 normalize and simplify code 2013-03-17 16:10:43 +01:00
Grand Philippe
29b8ce1c2d try to fix: supplier invoice numbering 2013-03-17 15:27:52 +01:00
Grand Philippe
6afa1cb2c9 normalize 2013-03-17 14:40:49 +01:00
Laurent Destailleur
d2d0f83fa0 Merge pull request #754 from simnandez/3.3 
Trad:  Fix: A better fix for status/list of orders.
 2013-03-17 06:30:10 -07:00
eldy
1d09e122c0 Some debug with pgsql 2013-03-17 14:28:57 +01:00
Laurent Destailleur
ca96bd6467 Merge pull request #753 from grandoc/develop 
try to fix : cannot display numbering models
 2013-03-17 05:05:28 -07:00
Grand Philippe
57d20e28fb normalize and simplify code 2013-03-17 12:56:54 +01:00
Grand Philippe
c44e9d6044 normalize and simplify code 2013-03-17 11:00:38 +01:00
Grand Philippe
88256b7531 normalize 2013-03-17 10:21:44 +01:00
Grand Philippe
bda1c7656b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-17 10:03:29 +01:00
simnandez
54f963f8ae Trad: Fix: A better fix for status/list of orders. 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
 2013-03-16 22:32:03 +01:00
Laurent Destailleur
d4f5ac8754 Fix: regression after rename of field 2013-03-16 18:02:32 +01:00
Grand Philippe
8931a19b7e try to fix : cannot display numbering models 2013-03-16 17:25:39 +01:00
Grand Philippe
d2c10159fe try to fix : cannot display numbering models 2013-03-16 17:10:24 +01:00
Laurent Destailleur
33a7692fbc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/exports/class/export.class.php
 2013-03-16 17:07:35 +01:00
Laurent Destailleur
013b7eca10 Fix: A better fix for status/list of orders. 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
 2013-03-16 17:02:13 +01:00
fhenry
07bc0cd09e Taking account remark 
1f5ebb594a
 2013-03-16 17:01:17 +01:00
Grand Philippe
86dff79b73 try to fix : cannot display numbering models 2013-03-16 16:58:45 +01:00