Laurent Destailleur
|
6d3834b3b9
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
|
2015-02-23 14:59:24 +01:00 |
|
Marcos García de La Fuente
|
7e07638fba
|
Little refactor
|
2015-02-23 10:51:43 +01:00 |
|
Marcos García de La Fuente
|
71b98ee82b
|
Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them.
|
2015-02-23 10:42:10 +01:00 |
|
Marcos García de La Fuente
|
702c19dab3
|
Refactored function getBrowserInfo
|
2015-02-22 13:17:57 +01:00 |
|
Laurent Destailleur
|
2bc6ac4671
|
Finished new module to manage expense reports !
Fix export to support corectly multicompany
|
2015-02-22 13:16:49 +01:00 |
|
Marcos García de La Fuente
|
ce916f3bcb
|
Better practice in getBrowserInfo
|
2015-02-22 12:35:51 +01:00 |
|
Laurent Destailleur
|
6d1324b463
|
Work on expense report module
|
2015-02-21 16:15:54 +01:00 |
|
aspangaro
|
63099727d0
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2015-02-21 15:10:35 +01:00 |
|
Laurent Destailleur
|
938936b8f2
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/lib/agenda.lib.php
htdocs/core/lib/functions.lib.php
|
2015-02-20 22:51:47 +01:00 |
|
Laurent Destailleur
|
e1e31de229
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2015-02-20 20:15:04 +01:00 |
|
Marcos García de La Fuente
|
3a917a0d1f
|
Merge branch '3.6' into bug-1825
|
2015-02-20 10:19:08 +01:00 |
|
Marcos García de La Fuente
|
fd18aa8717
|
Better fix for Bug #1825
|
2015-02-20 10:17:02 +01:00 |
|
Laurent Destailleur
|
639aaebacb
|
Merge branch 'bug-1825' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1825
Conflicts:
ChangeLog
|
2015-02-19 09:47:22 +01:00 |
|
Laurent Destailleur
|
ec56667f5e
|
Fix: [ bug #1849 ] Broken flag image when a contact does not have a
country set
|
2015-02-19 09:44:22 +01:00 |
|
Laurent Destailleur
|
94751ba57b
|
Merge pull request #2361 from aspangaro/3.7-patch3
[T1728] Deactivate RIB suggest in proposals/invoices/orders
|
2015-02-19 09:41:39 +01:00 |
|
Laurent Destailleur
|
d1a4b6c2c5
|
phpcs
|
2015-02-19 00:04:35 +01:00 |
|
Laurent Destailleur
|
e3713c8b6d
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
|
2015-02-19 00:01:26 +01:00 |
|
Laurent Destailleur
|
774389940e
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/compta/bank/ligne.php
htdocs/compta/resultat/clientfourn.php
htdocs/compta/salaries/fiche.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/facture/paiement.php
|
2015-02-18 23:51:41 +01:00 |
|
Laurent Destailleur
|
4963555669
|
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
|
2015-02-18 22:54:02 +01:00 |
|
frederic34
|
4bbbff8d69
|
Add BIC/SWIFT Validation
|
2015-02-17 22:04:16 +01:00 |
|
frederic34
|
07197f3ca0
|
Add libs
|
2015-02-17 11:41:50 +01:00 |
|
frederic34
|
9d0ffb7e85
|
Add php-iban and check IBAN
|
2015-02-17 10:23:31 +01:00 |
|
Laurent Destailleur
|
1e78d0e8d4
|
New: Introduce hidden option
STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a
missing control on missing warehouse.
|
2015-02-16 20:46:54 +01:00 |
|
Laurent Destailleur
|
213c818204
|
Debug serial/lot management
|
2015-02-16 20:14:16 +01:00 |
|
Marcos García de La Fuente
|
3efb737cbf
|
Fix: [ bug #1845 ] Undefined "$conf->browser->ie" var in "functions.lib.php"
|
2015-02-16 12:30:10 +01:00 |
|
Marcos García de La Fuente
|
6f08893016
|
Fix: [ bug #1846 ] Browser IE11 not detected
|
2015-02-16 12:26:20 +01:00 |
|
Marcos García de La Fuente
|
0a81fe667f
|
Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work
|
2015-02-16 10:44:10 +01:00 |
|
aspangaro
|
05dc308e91
|
[T1728] Deactivate RIB suggest in proposals/invoices/orders
|
2015-02-16 06:47:37 +01:00 |
|
Laurent Destailleur
|
2e0b2fb012
|
Work on expensereport module
|
2015-02-15 22:49:23 +01:00 |
|
Laurent Destailleur
|
448655ea45
|
First work on a new module for expense report matching dolibarr
standard to replace current one.
|
2015-02-14 18:39:45 +01:00 |
|
Laurent Destailleur
|
d5ec19ef83
|
Enhance help when running cron script from command line
|
2015-02-11 13:21:12 +01:00 |
|
Laurent Destailleur
|
e3885d6d73
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/core/lib/tax.lib.php
|
2015-02-10 21:36:38 +01:00 |
|
Laurent Destailleur
|
ddb95e5765
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
|
2015-02-10 21:33:43 +01:00 |
|
Marcos García de La Fuente
|
e485dd413d
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:41:59 +01:00 |
|
Marcos García de La Fuente
|
530186c59d
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:32:00 +01:00 |
|
Marcos García de La Fuente
|
0d6d98b395
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:17:37 +01:00 |
|
Marcos García de La Fuente
|
023175b9f1
|
PHPDoc and misc fixes for several folders
|
2015-02-10 11:38:13 +01:00 |
|
Marcos García de La Fuente
|
e21681a369
|
PHPDoc and misc fixes for Admin
|
2015-02-10 10:52:48 +01:00 |
|
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 |
|
Marcos García de La Fuente
|
58a61e1294
|
Changed int typecast to float
|
2015-02-10 00:23:32 +01:00 |
|
Marcos García de La Fuente
|
949f9e40a0
|
Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
|
2015-02-10 00:20:47 +01:00 |
|
phf
|
65a3c75b04
|
[CORE] ajout des conditions dans la librairie pour le module (#new_ask_price).
|
2015-02-09 11:57:30 +01:00 |
|
phf
|
34bc1dbc15
|
Merge branch 'develop' into new_ask_price
|
2015-02-09 09:07:50 +01:00 |
|
Laurent Destailleur
|
e8b2b22c32
|
Merge branch 'bug-1827' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1827
Conflicts:
ChangeLog
|
2015-02-07 23:56:38 +01:00 |
|
Laurent Destailleur
|
3bdf8864a9
|
New: Add option MAXTABS_IN_CARD to limit number of visible tabs.
|
2015-02-07 04:24:31 +01:00 |
|
Laurent Destailleur
|
011d39105d
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
|
2015-02-07 03:28:36 +01:00 |
|
Laurent Destailleur
|
ba5d355eb3
|
Fix bad property
|
2015-02-07 02:14:45 +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 |
|
Marcos García de La Fuente
|
b8b9df7b95
|
Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes
|
2015-02-06 12:36:09 +01:00 |
|