lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,785 Commits 43 Branches 150 Tags 886 MiB
3.6.beta1_20140514
Commit Graph

1224 Commits

Author SHA1 Message Date
Florian HENRY
fb277bbbab fix llx_societe.datea call in request 2014-05-13 19:32:04 +02:00
Laurent Destailleur
64f8dcf131 Fix: Bad syntax of vars 2014-05-12 12:10:52 +02:00
Laurent Destailleur
8428caf8fb List cleaner 2014-05-11 21:59:35 +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
Marcos García de La Fuente
ae28727fea Improving documentation of Societe class 2014-05-05 12:53:46 +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
Laurent Destailleur
93393db991 Merge pull request #1539 from defrance69/patch-7 
Update index.php
 2014-05-04 19:15:21 +02:00
Laurent Destailleur
9ebcec5b4e Fix: duplicate declaration of property 2014-05-04 19:07:30 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Laurent Destailleur
5b5a894aaf Merge pull request #1567 from marcosgdf/doc 
Improved documentation of Societe and started type hinting variables
 2014-05-04 18:07:08 +02:00
Laurent Destailleur
c9ebe7729f Merge branch 'bug-1371' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1371

Conflicts:
	ChangeLog
 2014-05-04 17:56:24 +02:00
BENKE Charles
a090333dbd Update index.php 
if nb of categories > 10 we add "other" on the pie charts
 2014-05-04 17:50:31 +02:00
Laurent Destailleur
4e590e0c5e Merge pull request #1564 from marcosgdf/minor 
Fixed problem with non existing variable $db and removed not used variab...
 2014-05-04 17:46:18 +02:00
Laurent Destailleur
bc35728ea3 Merge pull request #1562 from marcosgdf/translation 
Improved translations
 2014-05-04 17:39:36 +02:00
Laurent Destailleur
1fc25abf25 Fix: checkstyle on deprecated tag. 2014-05-04 17:31:23 +02:00
Laurent Destailleur
4d783b3934 Qual: Mark class as deprecated 2014-05-04 17:00:37 +02:00
Laurent Destailleur
d25778f12b Qual: Removed duplicate column "datea" into table llx_societe 
(duplicated with column tms).
 2014-05-04 16:59:13 +02:00
Marcos García de La Fuente
862a8626f9 Documenting variables 2014-05-04 11:31:05 +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
Marcos García de La Fuente
08301e3478 Corrected little bug when no state_id was defined 2014-05-03 17:16:37 +02:00
Marcos García de La Fuente
85c605449e Defined missing used variables of the class and removed unused local vars 2014-05-03 13:45:20 +02:00
Marcos García de La Fuente
eb57d729a3 Typehinting $user variable 2014-05-03 13:23:45 +02:00
Marcos García de La Fuente
4cf3857aa4 Improved documentation of Societe and started type hinting variables 2014-05-03 13:19:03 +02:00
Marcos García de La Fuente
21c416805a Moved the info about hidden constants DONOTSEARCH_ANYWHERE to a tooltip 2014-05-03 12:57:12 +02:00
Laurent Destailleur
c02fbcf293 Clean code. 2014-05-03 02:57:46 +02:00
Marcos García de La Fuente
4599b22cb5 Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents 2014-05-02 17:15:56 +02:00
Marcos García de La Fuente
af45ee1bc3 Fixed problem with non existing variable $db and removed not used variable $conf 2014-05-02 16:51:25 +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
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
BENKE Charles
f05643116a Update index.php 2014-04-20 14:22:27 +02:00
BENKE Charles
758b732391 Update index.php 
add piechart on society categories
 2014-04-20 12:04:42 +02:00
Laurent Destailleur
ce34c01b9e New: On page to enter supplier prices, if there is no supplier, add 
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
 2014-04-16 00:06:16 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
c57c3aef84 Fix: Missing return 2014-04-05 16:28:09 +02:00
Laurent Destailleur
76259a633c Clean constant FACTURE_TVAOPTION into conf.class.php so we don't have 
to do it everywhere at different places. Value is now 0 or 1.
 2014-03-31 02:16:49 +02:00
Laurent Destailleur
2d3c700a7d Fix: When cloning product, autogenerating barcode must not use same 
number.
Qual: Moved dedicated permission of module to "advance" permissions.
 2014-03-16 17:37:54 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
6cec011df6 New: Add manager name (ceo, director, president...) into main company 
information page.
 2014-03-13 12:22:53 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
 2014-02-26 15:49:29 +01:00
Peter Fontaine
8ec10f8efa Add state_id in contact for individual third party 2014-02-24 21:20:06 +01:00
Florian Henry
d242f4930d php codesniffer 2014-02-23 17:01:51 +01:00
Florian Henry
46ae5d6e9c - New: Price management enhancement (multiprice level, price by 
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
 2014-02-23 16:16:47 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
Laurent Destailleur
5a29b3d546 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/societe/soc.php
 2014-02-19 15:37:48 +01:00
Laurent Destailleur
4915ec8916 Fix: Bad space in predefined messages. 
Fix: Signature was not added for email sent from thirdparty page.
 2014-02-19 15:33:04 +01:00
Laurent Destailleur
2e67bbc382 Maxi debug of barcode feature. 
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
 2014-02-19 01:51:19 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
 2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0 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/makepack-dolibarr.pl
	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/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00