lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,050 Commits 43 Branches 150 Tags 886 MiB
157a6e109e
Commit Graph

6606 Commits

Author SHA1 Message Date
Marcos García de La Fuente
157a6e109e Misc Adherents PHPDoc corrections 2015-02-10 10:45:48 +01:00
Marcos García de La Fuente
0d150b1d32 Removed unused code, misc corrections and corrected PHPDoc problems. 2015-02-10 10:25:59 +01:00
Laurent Destailleur
1314d9ce4e Merge pull request #2311 from marcosgdf/bug-1810 
Fix: [ bug #1810 ] [pgsql] Error while upgrading from 3.6 to 3.7
 2015-02-07 23:41:48 +01:00
Laurent Destailleur
1d1b3da182 Fix: the syslog handler for chromphp an fiefoxphp was not visible when 
they should not.
 2015-02-07 19:30:28 +01:00
Laurent Destailleur
64963ef9bd Fix: the syslog handler for chromphp an fiefoxphp was not visible when 
they should not.
 2015-02-07 19:12:22 +01:00
Laurent Destailleur
90fdc29d5e Fix restore compatibility 2015-02-07 17:41:20 +01:00
Laurent Destailleur
553181a5d9 Fixed: Location for file storage from tab attached files was not at same 
place than from tab images.
 2015-02-06 21:26:41 +01:00
Laurent Destailleur
35129f2192 Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly 
supported.
Fix: No limit on ldap search on dolibarr side.
 2015-02-06 16:33:33 +01:00
Laurent Destailleur
4477a712d6 Fix: calendar was not using option START_WEEK. 2015-02-03 14:02:36 +01:00
Laurent Destailleur
0b01fa8eb8 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-03 13:45:10 +01:00
Laurent Destailleur
f865534b4c Fix some pdf differences 2015-02-03 13:43:37 +01:00
Laurent Destailleur
7ac35593e1 Merge pull request #2314 from aspangaro/3.7-Accountancy 
FIXED Accountancy clean code
 2015-02-03 13:11:16 +01:00
Laurent Destailleur
96215ccea5 Fix bad operator for and 2015-02-03 13:05:28 +01:00
Laurent Destailleur
41cabeee59 Fix pb into date management. 
Added phpunit to avoid this in future.
 2015-02-03 12:40:49 +01:00
Laurent Destailleur
fe674f8fd5 Fix pb into date management. 
Added phpunit to avoid this in future.
 2015-02-03 12:21:30 +01:00
Laurent Destailleur
20121c2fbe Fix pb into date management. 
Added phpunit to avoid this in future.
 2015-02-03 11:25:51 +01:00
aspangaro
14a078c9a7 FIXED Accountancy clean code 2015-02-03 06:39:44 +01:00
Laurent Destailleur
7809013b96 Message is more clear. 2015-02-02 13:33:16 +01:00
Marcos García de La Fuente
a9ba2f3179 Fix: [ bug #1810 ] [pgsql] Error while upgrading from 3.6 to 3.7 2015-02-02 11:48:57 +01:00
Laurent Destailleur
6976aec04b Merge pull request #2289 from accett/patch-2 
Currency symbol in Mexico
 2015-01-31 19:40:57 +01:00
Laurent Destailleur
2788a352cf Missing lang loading 2015-01-31 19:00:00 +01:00
Laurent Destailleur
d32f52cc50 Fix date of delivery, and avoid duplicate tracking number. 2015-01-31 16:23:23 +01:00
Laurent Destailleur
ce8ad39a8e Remove test code and restore prod code. 2015-01-31 13:00:51 +01:00
Laurent Destailleur
d6dc495a42 Removed bad print 2015-01-30 16:01:56 +01:00
Laurent Destailleur
67c1ae8593 Fixed: condition to show menus 2015-01-30 15:47:27 +01:00
Laurent Destailleur
ad6af14edd Fixed: Status was not visible if selected. 2015-01-28 19:27:56 +01:00
AcceTT Soluciones Computacionales
608b099934 Currency symbol in Mexico 
I tried to change the order of the currency symbol in Mexico is before.
 2015-01-26 21:38:43 -06:00
Laurent Destailleur
ffde00de81 Fixed date change was lost when changing event assignement. 2015-01-26 10:31:41 +01:00
Laurent Destailleur
da9f13bca9 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-25 22:30:05 +01:00
Laurent Destailleur
57c84089fe Introduce warning to remind to do a backup before migration. 
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
 2015-01-25 22:29:36 +01:00
Laurent Destailleur
b926a77325 Merge pull request #2280 from aspangaro/3.7-Accountancy 
FIXED Accounting module - Align integrate core version & module version 3.6
 2015-01-25 17:53:17 +01:00
Laurent Destailleur
3ebaaa38d2 Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC 2015-01-25 16:04:37 +01:00
aspangaro
ae11ab12f6 FIXED Accounting module - Align core & module 3.6 2015-01-25 06:54:17 +01:00
Laurent Destailleur
ad68b3ca6c Fixed approve during validation if user has permission 
Fixed error management
Fixed rendering country must be same for all tabs.
 2015-01-25 00:59:46 +01:00
Laurent Destailleur
a4990a58b1 The badge was missing for shipment 2015-01-23 18:39:40 +01:00
Laurent Destailleur
083cf06908 Fixed: Tracking number restored on PDF shipments 
Fixed: Translation
 2015-01-23 18:33:33 +01:00
Laurent Destailleur
0f7238937a Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/commande/fiche.php
 2015-01-22 18:55:26 +01:00
Laurent Destailleur
4bb86717cf Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-22 12:30:18 +01:00
Laurent Destailleur
31be2563c2 Fixed: Allow external module a chance to fix regression. 2015-01-22 12:29:55 +01:00
jean
b809f0aeb8 Merge remote-tracking branch 'origin/3.6' into 3.6 2015-01-20 17:31:17 +01:00
jean
5ec0b32ab0 add left joins on llx_c_actiocomm 2015-01-20 17:26:32 +01:00
Laurent Destailleur
e14684c417 Merge pull request #2259 from marcosgdf/misc-fixes 
misc-fixes
 2015-01-19 15:28:28 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
55b8c28100 Corrected weird typo 2015-01-18 16:28:42 +01:00
Laurent Destailleur
7b7b8f376f Merge branch 'bug-1784' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1784

Conflicts:
	ChangeLog
 2015-01-18 15:13:26 +01:00
Laurent Destailleur
d1e2ab6f56 Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1783

Conflicts:
	ChangeLog
 2015-01-18 15:10:30 +01:00
Laurent Destailleur
c35de1aa06 Merge branch 'bug-1803' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1803

Conflicts:
	ChangeLog
 2015-01-18 15:01:18 +01:00
Laurent Destailleur
b1f889e1d1 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-01-18 12:46:23 +01:00
Marcos García de La Fuente
71e5cf07c6 Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes 2015-01-18 03:12:46 +01:00
Marcos García de La Fuente
78905c6af1 Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas 2015-01-17 20:29:51 +01:00