Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
42,407 Commits 36 Branches 189 Tags
aabbc331a4eac871e7e1e05fbc4928cf3d20e4aa
Commit Graph

4854 Commits

Author SHA1 Message Date
Laurent Destailleur
91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
 2014-08-08 01:19:03 +02:00
Laurent Destailleur
de76fe4951 Fix: Missing join into request. 
Conflicts:
	htdocs/compta/facture.php
 2014-08-07 15:05:31 +02:00
Laurent Destailleur
1239e713c9 Fix: Missing join into request. 2014-08-07 15:00:10 +02:00
Laurent Destailleur
76353bf427 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2014-08-04 22:18:30 +02:00
Florian HENRY
44f06bef22 Unpaid invoice launch fusion PDF action even if it is only search (with 
enter keyboard input instead of lens click)
 2014-08-01 15:21:29 +02:00
Laurent Destailleur
07cf09536d Fix: delete bank account 2014-08-01 14:48:48 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
nicoplh
2cfc5f10a8 Update impayees.php 
remove useless type alpha.
 2014-07-18 14:47:23 +02:00
nicoplh
25a591bd03 Update impayees.php 
Add column ref.Client with search module.
 2014-07-17 16:21:23 +02:00
Laurent Destailleur
14de1d66c0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-29 23:56:23 +02:00
Florian HENRY
e8bb5d5cc0 Syntax 2014-06-29 17:43:22 +02:00
Florian HENRY
1857280234 Fix [ bug #1516 ] PRODUIT_CUSTOMER_PRICES don't take default price if 
not defined for customer
 2014-06-29 17:39:54 +02:00
Laurent Destailleur
198a8d40f7 Fix: Missing translation 2014-06-29 13:53:07 +02:00
Laurent Destailleur
fc4493242a Merge pull request #1685 from KreizIT/3.6 
FIX : #1477, #1478, #1479
 2014-06-26 21:00:26 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
Cedric
ee91f4a3f7 FIX : #1477, #1478, #1479 2014-06-25 13:37:55 +02:00
Laurent Destailleur
76532218c2 Fix: [ bug #1476 ] Invoice creation form loses invoice date when there 
is a validation error
 2014-06-21 15:35:30 +02:00
Laurent Destailleur
39eea995a4 Merge pull request #1675 from FHenry/3.5 
Fix == instaed of = in variable affectation
 2014-06-20 16:52:44 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Florian HENRY
d09ccf5855 Fix == instaed of = in variable affectation 2014-06-20 13:21:49 +02:00
Laurent Destailleur
e7f08c6d37 Merge pull request #1674 from atm-maxime/3.5 
Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix...
 2014-06-20 13:20:50 +02:00
Laurent Destailleur
51eb761b02 Merge pull request #1669 from aspangaro/develop-patch1 
Correction on 3.6beta
 2014-06-20 13:12:39 +02:00
Maxime Kohlhaas
aaabf9647d Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix) 2014-06-20 09:33:25 +02:00
Maxime Kohlhaas
bd21a559da Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-06-20 09:06:36 +02:00
Florian HENRY
0645189432 If multiprice level is used the VAT on addline is not correct 2014-06-18 10:56:38 +02:00
aspangaro
516363f491 Bank - Enhance readability 2014-06-17 06:43:50 +02:00
Laurent Destailleur
4c0fe98ae2 Merge pull request #1665 from atm-maxime/develop 
Fix 1480, 1483, 1497 $this instead of $object
 2014-06-14 14:13:10 +02:00
Maxime Kohlhaas
19a3194b02 Fix : duedate was not auto calculated + move calculation function to common invoice class 2014-06-14 12:53:02 +02:00
Maxime Kohlhaas
d0a417ad36 Fix 1480, 1483, 1497 $this instead of $object 2014-06-14 11:37:57 +02:00
frederic34
88c5d6e5d1 Display the total with currency 2014-06-11 18:01:14 +02:00
frederic34
89547dde37 Display the total by currency account 2014-06-11 17:42:03 +02:00
Marcos García de La Fuente
9344123887 CR Fix 2014-06-09 15:25:31 +02:00
fmarcet
66606b42ca Fix: Serious bug on withdrawal 2014-06-06 17:06:30 +02:00
Laurent Destailleur
e5bd170114 Add comment 2014-05-30 11:21:24 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
4076a4a643 Fix: select_date accepts -1, '' or a date but not '0' 2014-05-25 14:51:56 +02:00
Laurent Destailleur
8e7b310fb6 Fix: [ bug #1400 ] Silent Warning create a draft invoice 2014-05-25 05:01:14 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Regis Houssin
b39627288e Fix: missing hookmanager global 2014-05-21 11:48:45 +02:00
Raphaël Doursenaud
c3f05d1c1c Withdrawals: fixed bad translation key 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
3209483f1b Bank search: Better wording 2014-05-19 14:38:26 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
d7d8eba6b1 Merge pull request #1592 from atm-alexis/3.5_adding_page_to_list_product_as_other_list 
Fix page numerotation for product, invoice and others as in company list
 2014-05-14 11:26:22 +02:00
Laurent Destailleur
f621f7eb32 Fix: The rounding mode is now forced when provided explicitly and no 
more by default (we keep data intact when no mode provided).
 2014-05-13 13:22:29 +02:00
Laurent Destailleur
69eaefc459 Fix: The way we tested if a ref/id already exists was wrong. Introduce a 
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
 2014-05-13 10:12:45 +02:00
Laurent Destailleur
bd061f4245 Fix: [ bug #1380 ] Customer invoices are not grouped in company results 
report
 2014-05-13 01:29:01 +02:00
Laurent Destailleur
18848eaf74 Clean forms 2014-05-12 13:25:36 +02:00
Laurent Destailleur
3393b1c5fb Fix: Date of invoice is set to current date when cloning. // TODO Best 
is to ask date into confirm box.
 2014-05-12 12:15:54 +02:00
Laurent Destailleur
64f8dcf131 Fix: Bad syntax of vars 2014-05-12 12:10:52 +02:00