Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 10:08:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
41,866 Commits 36 Branches 190 Tags
4b9d1b901bccd39b6cd8967ae13b84f8221b0e00
Commit Graph

1382 Commits

Author SHA1 Message Date
Laurent Destailleur
44ebaf45cf Fix: favicon must use dol_buildpath and not hardcoded path 2014-05-24 18:21:05 +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
Laurent Destailleur
4a7e9e4d0b Fix: CRLF 2014-05-21 19:54:40 +02:00
Laurent Destailleur
366bd64c4f Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:44:53 +02:00
Raphaël Doursenaud
00162cc93d Members: fixed typo 2014-05-19 14:38:26 +02:00
Laurent Destailleur
15796ec592 Fix: checkstyle errors 2014-05-14 12:19:45 +02:00
Laurent Destailleur
b3b7da8f08 Merge pull request #1595 from FHenry/develop 
Add showempty into combobox
 2014-05-14 11:46:35 +02:00
Laurent Destailleur
757d92a318 Merge pull request #1589 from aternatik/resource_core 
Core integration of resource module
 2014-05-14 11:25:25 +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
Florian HENRY
b6f091926f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-13 11:40:39 +02:00
Florian HENRY
d2e2dabf26 Add showempty into combobox 2014-05-13 11:40:19 +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
64f8dcf131 Fix: Bad syntax of vars 2014-05-12 12:10:52 +02:00
Jean-François Ferry
b3f7e9f99b Fix : bad usage of this 2014-05-10 22:07:54 +02:00
Jean-François Ferry
e4962e9efd Add resource card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
fdb50ab116 Move generic function from commonobject.class to functions2.lib.php (work on resource module) 2014-05-10 22:06:22 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 18:57:04 +02:00
Laurent Destailleur
1724fd2f89 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-10 16:44:12 +02:00
Laurent Destailleur
4e41b721fb Fix: Nb of notes and doc not visible onto tasks. 2014-05-10 16:43:47 +02:00
Florian HENRY
2aa2f896c6 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-09 13:28:45 +02:00
Florian HENRY
02e0fac79f "or" into if instead of || 2014-05-09 13:28:29 +02:00
Laurent Destailleur
7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php
 2014-05-07 19:30:19 +02:00
Laurent Destailleur
4bf86508a5 Merge pull request #1583 from FHenry/3.5 
Fix error return project deletion
 2014-05-07 19:25:02 +02:00
Laurent Destailleur
16b3ec8923 Fix: concat of string must use dol_concat. 2014-05-07 19:06:47 +02:00
Laurent Destailleur
1bc3558307 Fix: Better html detection 2014-05-07 19:06:15 +02:00
Florian HENRY
0e2497e710 [ bug #1377 ] Warning: get_class() called without object from outside a 
class
 2014-05-07 18:19:46 +02:00
Florian HENRY
395e09d64d fix warning message into function2.lib.php 2014-05-07 17:25:50 +02:00
Laurent Destailleur
845f764f93 Increase default size of image 2014-05-07 12:21:14 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2014-05-06 23:58:17 +02:00
Laurent Destailleur
fe43d10c79 Fix: [ bug #1360 ] note indicator for member tab. 2014-05-06 23:42:19 +02:00
Laurent Destailleur
959b104b78 Fix: the pdf template name for typhon as not correctly set when enabling 
module.
 2014-05-06 13:31:30 +02:00
Laurent Destailleur
c4291c228e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-06 13:16:06 +02:00
Laurent Destailleur
948e0bf753 Fix: When on delivery receipt, ref of shipment was not visible. Also 
some tabs were missing.
Fix: After deletion of delivery receipt, we must go back to shipment of
delivery receipt.
 2014-05-06 13:15:37 +02:00
philippe
a04cd99090 fix : no room when number of pages sup than 9 2014-05-05 19:03:25 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +02:00
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
Laurent Destailleur
bcdf3e8a51 New: The combo list of juridical status is now sorted 2014-05-04 23:46:36 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
d97c45a9b8 Add version of phpunit into travis script. 
Fix: strict mode.
 2014-05-01 19:17:45 +02:00
Laurent Destailleur
7bb23086b8 Fix: Strict mode 2014-05-01 17:06:14 +02:00
Laurent Destailleur
880f77b7e1 Fix: Preview feature 2014-04-30 13:50:25 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Laurent Destailleur
4a23a8a789 Merge branch 'category_translate' of github.com:aternatik/dolibarr into 
aternatik-category_translate

Conflicts:
	ChangeLog
 2014-04-28 02:39:56 +02:00
Laurent Destailleur
e5c5b15ecc Qual: Start to clean module ECM (Code is to complex). Prepare for 
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
 2014-04-28 01:46:11 +02:00
Laurent Destailleur
8beaf30e88 Qual: Removed useless use of js 2014-04-27 01:51:31 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Laurent Destailleur
4fa472518e Fix: doxygen 2014-04-26 22:23:46 +02:00
Laurent Destailleur
537ada96a8 Fix: [ bug #1354 ] Tasks disapear in same sub-task 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/projet/class/project.class.php
 2014-04-26 21:47:15 +02:00
Laurent Destailleur
af2cf0b66f Fix: [ bug #1354 ] Tasks disapear in same sub-task 2014-04-26 21:36:58 +02:00