Laurent Destailleur
|
ba6193cff7
|
Add indonesia provinces
|
2018-05-25 14:57:30 +02:00 |
|
Laurent Destailleur
|
943d1dce2e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-05-25 13:15:38 +02:00 |
|
Laurent Destailleur
|
8a64ee2297
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/commande/list.php
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/list.php
htdocs/societe/card.php
|
2018-05-25 13:14:58 +02:00 |
|
Laurent Destailleur
|
823936ef87
|
Merge pull request #8847 from frederic34/multipriceqty
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
|
2018-05-25 12:55:02 +02:00 |
|
Laurent Destailleur
|
bcbe28d802
|
Code comment
|
2018-05-25 12:48:33 +02:00 |
|
Laurent Destailleur
|
46d98febbe
|
Merge pull request #8841 from ATM-Marc/FIX_6.0_pdf_note_incoterm
FIX: pdf: overlap when linked elements and incoterms/public note displayed
|
2018-05-25 12:03:27 +02:00 |
|
Laurent Destailleur
|
fa252d5cbd
|
Merge branch 'develop' into FIX_6.0_pdf_note_incoterm
|
2018-05-25 11:59:22 +02:00 |
|
Laurent Destailleur
|
1a1f0fbc62
|
Merge pull request #8839 from ATM-Nicolas/fix_shipping_fetch
FIX : Fetch shipping will now fetch project id
|
2018-05-25 11:46:06 +02:00 |
|
Laurent Destailleur
|
aa65b3f9ba
|
Merge pull request #8830 from wdammak/patch-8
Add liste_modeles to warehouse module
|
2018-05-25 11:43:48 +02:00 |
|
Laurent Destailleur
|
9d407cdc03
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-05-25 11:27:04 +02:00 |
|
Laurent Destailleur
|
0e6aa3def3
|
Fix duplicate deprecated file
|
2018-05-25 11:26:50 +02:00 |
|
Laurent Destailleur
|
3d71ce8297
|
Update html.formfile.class.php
|
2018-05-25 11:19:38 +02:00 |
|
Laurent Destailleur
|
520ce99e56
|
Merge pull request #8828 from bgenere/develop
FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php
|
2018-05-25 11:17:45 +02:00 |
|
Laurent Destailleur
|
a3bea8d298
|
Update commonobject.class.php
|
2018-05-25 11:17:01 +02:00 |
|
Laurent Destailleur
|
131ddd6984
|
Merge pull request #8827 from ATM-Marc/FIX_shipment_fk_project
FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods
|
2018-05-25 11:12:39 +02:00 |
|
Laurent Destailleur
|
7f77f1bd5a
|
Merge pull request #8825 from atm-florian/develop_advtrgtml
new : add adv targt emailing amdin with main feature level 1
|
2018-05-25 11:10:51 +02:00 |
|
Laurent Destailleur
|
cbe54e596b
|
Merge pull request #8817 from wdammak/patch-5
Add generateDocument function to entrepot class
|
2018-05-25 11:08:43 +02:00 |
|
Laurent Destailleur
|
c36187b46b
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-05-25 11:08:19 +02:00 |
|
Laurent Destailleur
|
3d97fa36d1
|
CSS
|
2018-05-25 11:08:05 +02:00 |
|
Laurent Destailleur
|
22b1f2574e
|
Merge pull request #8851 from atm-florian/develop
fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL on upgrade.php page where global is not yet defined
|
2018-05-25 11:07:18 +02:00 |
|
Laurent Destailleur
|
ac0570f6b2
|
Update translate.class.php
|
2018-05-25 11:07:11 +02:00 |
|
Laurent Destailleur
|
001b94698a
|
Merge pull request #8832 from dtix/develop
NEW Add romanian chart of accounts
|
2018-05-25 11:05:59 +02:00 |
|
Laurent Destailleur
|
b25c7e44d3
|
Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice
FIX : test is_erasable() must be done before call function delete()
|
2018-05-25 11:05:20 +02:00 |
|
Laurent Destailleur
|
0a581e48d4
|
Update card.php
|
2018-05-25 11:04:04 +02:00 |
|
Laurent Destailleur
|
8303dc1e6f
|
Merge pull request #8815 from atm-florian/develop_fixproject
NEW: add filter on project task list
|
2018-05-25 10:56:10 +02:00 |
|
Laurent Destailleur
|
034752dc0b
|
Update tasks.php
|
2018-05-25 10:54:17 +02:00 |
|
Laurent Destailleur
|
e7cfad0e60
|
Update tasks.php
|
2018-05-25 10:52:24 +02:00 |
|
Laurent Destailleur
|
c56ef86bc3
|
Update project.lib.php
|
2018-05-25 10:50:16 +02:00 |
|
Laurent Destailleur
|
973384604e
|
Merge pull request #8850 from grandoc/new_branch_24_05_2018
clean and update code
|
2018-05-25 10:45:39 +02:00 |
|
Laurent Destailleur
|
fbcaf8872b
|
Merge pull request #8808 from atm-john/Add_table_thead_and_tbody
Add table thead and tbody for object lines
|
2018-05-25 10:42:26 +02:00 |
|
Laurent Destailleur
|
04586fab66
|
Merge pull request #8824 from ggg44473/7.0
Fix sql error accounting account
|
2018-05-25 10:41:16 +02:00 |
|
Laurent Destailleur
|
02803f9284
|
Merge pull request #8821 from aspangaro/8.0-b26
Fix Loan : Move to Loadlangs / Remove oldcode (calc) / Presentation / Small problems
|
2018-05-25 10:36:46 +02:00 |
|
Laurent Destailleur
|
205732e240
|
Merge pull request #8822 from aspangaro/8.0-b27
Salaries : Move to LoadLangs
|
2018-05-25 10:34:36 +02:00 |
|
Laurent Destailleur
|
f416f9629e
|
Merge pull request #8840 from all3kcis/patch-9
Add oldcopy on productlot::update()
|
2018-05-25 10:22:18 +02:00 |
|
Laurent Destailleur
|
d99684f9aa
|
Merge pull request #8842 from GPCsolutions/develop-unittesttypo
Fix typo
|
2018-05-25 10:16:36 +02:00 |
|
Laurent Destailleur
|
545133960e
|
Merge pull request #8849 from atm-quentin/FIX_missing_filters_during_ordering
FIX missing filters during reordering
|
2018-05-25 10:15:20 +02:00 |
|
Laurent Destailleur
|
5d5638d906
|
Merge pull request #8848 from frederic34/typo
typo
|
2018-05-25 10:14:41 +02:00 |
|
Laurent Destailleur
|
3816b18c27
|
Merge pull request #8856 from glu000/7.0
FIX: It's not possible to remove a contact which is assigned to an event #8852
|
2018-05-25 10:14:19 +02:00 |
|
Laurent Destailleur
|
923fcfb36e
|
Merge pull request #8854 from glu000/develop
FIX: It's not possible to remove a contact which is assigned to an event #8852
|
2018-05-25 10:14:05 +02:00 |
|
Laurent Destailleur
|
76b34a5a60
|
Merge pull request #8857 from aspangaro/8.0-b28
FIX : Replace feature level 2 by a constant on accountancy journal
|
2018-05-25 10:13:20 +02:00 |
|
Laurent Destailleur
|
b9fbf13eba
|
Fix look and feel v8
|
2018-05-25 09:36:49 +02:00 |
|
Laurent Destailleur
|
9f2f8ca7e0
|
Fix scrutinizer
|
2018-05-25 09:31:16 +02:00 |
|
Alexandre SPANGARO
|
46a251a2b3
|
FIX : Replace feature level 2 by a constant on accountancy journal
|
2018-05-24 21:13:48 +02:00 |
|
Alexandre SPANGARO
|
d1e1d64b42
|
Add some information in bank_journal
|
2018-05-24 20:26:38 +02:00 |
|
Alexandre SPANGARO
|
7d2d818679
|
Fix link
|
2018-05-24 20:25:06 +02:00 |
|
Günter Lukas
|
3adfce35e2
|
Update card.php
|
2018-05-24 13:32:13 +02:00 |
|
Günter Lukas
|
1b237a75b9
|
Update card.php
|
2018-05-24 13:31:23 +02:00 |
|
Laurent Destailleur
|
23e2bb20d9
|
Look and feel v8
|
2018-05-24 12:32:04 +02:00 |
|
Laurent Destailleur
|
e51aa68284
|
Fix link to warehouses for events
|
2018-05-24 12:16:04 +02:00 |
|
Frédéric FRANCE
|
0623ff7667
|
fix logic
|
2018-05-24 11:56:19 +02:00 |
|